Mark Johnston
182ed3c075
When creating OS images as a non-root user, it may be useful to pre-create users in the staged tree. The useradd operation adds files to the new user's home directory, copied from the skeleton directory (/usr/share/skel), which makes it inconvient for use in this scenario since the added files are not recorded in the mtree metalog. To cover this gap, this change adds a new -M <metalog> option to pw's useradd operation, causing pw to add mtree entries for newly added files. Extend an existing regression test to validate this mode. Reviewed by: bapt, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52590
141 lines
3.7 KiB
C
141 lines
3.7 KiB
C
/*-
|
|
* Copyright (C) 2015 Baptiste Daroussin <bapt@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer
|
|
* in this position and unchanged.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include <err.h>
|
|
#include <sysexits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "pw.h"
|
|
|
|
int
|
|
pw_checkfd(char *nptr)
|
|
{
|
|
const char *errstr;
|
|
int fd = -1;
|
|
|
|
if (strcmp(nptr, "-") == 0)
|
|
return '-';
|
|
fd = strtonum(nptr, 0, INT_MAX, &errstr);
|
|
if (errstr != NULL)
|
|
errx(EX_USAGE, "Bad file descriptor '%s': %s",
|
|
nptr, errstr);
|
|
return (fd);
|
|
}
|
|
|
|
uintmax_t
|
|
pw_checkid(char *nptr, uintmax_t maxval)
|
|
{
|
|
const char *errstr = NULL;
|
|
uintmax_t id;
|
|
|
|
id = strtounum(nptr, 0, maxval, &errstr);
|
|
if (errstr)
|
|
errx(EX_USAGE, "Bad id '%s': %s", nptr, errstr);
|
|
return (id);
|
|
}
|
|
|
|
struct userconf *
|
|
get_userconfig(const char *config)
|
|
{
|
|
char defaultcfg[MAXPATHLEN];
|
|
|
|
if (config != NULL)
|
|
return (read_userconfig(config));
|
|
snprintf(defaultcfg, sizeof(defaultcfg), "%s/" _PW_CONF, conf.etcpath);
|
|
return (read_userconfig(defaultcfg));
|
|
}
|
|
|
|
int
|
|
nis_update(void) {
|
|
pid_t pid;
|
|
int i;
|
|
|
|
fflush(NULL);
|
|
if ((pid = fork()) == -1) {
|
|
warn("fork()");
|
|
return (1);
|
|
}
|
|
if (pid == 0) {
|
|
execlp("/usr/bin/make", "make", "-C", "/var/yp/", (char*) NULL);
|
|
_exit(1);
|
|
}
|
|
waitpid(pid, &i, 0);
|
|
if ((i = WEXITSTATUS(i)) != 0)
|
|
errx(i, "make exited with status %d", i);
|
|
return (i);
|
|
}
|
|
|
|
static void
|
|
metalog_emit_record(const char *path, const char *target, mode_t mode,
|
|
uid_t uid, gid_t gid, int flags)
|
|
{
|
|
const char *flagstr, *type;
|
|
int error;
|
|
|
|
if (conf.metalog == NULL)
|
|
return;
|
|
|
|
if (target != NULL)
|
|
type = "link";
|
|
else if (S_ISDIR(mode))
|
|
type = "dir";
|
|
else if (S_ISREG(mode))
|
|
type = "file";
|
|
else
|
|
errx(1, "metalog_emit: unhandled file type for %s", path);
|
|
|
|
flagstr = fflagstostr(flags &
|
|
(UF_IMMUTABLE | UF_APPEND | SF_IMMUTABLE | SF_APPEND));
|
|
if (flagstr == NULL)
|
|
errx(1, "metalog_emit: fflagstostr failed");
|
|
|
|
error = fprintf(conf.metalog,
|
|
"./%s type=%s mode=0%03o uid=%u gid=%u%s%s%s%s\n",
|
|
path, type, mode & ACCESSPERMS, uid, gid,
|
|
target != NULL ? " link=" : "", target != NULL ? target : "",
|
|
*flagstr != '\0' ? " flags=" : "", *flagstr != '\0' ? flagstr : "");
|
|
if (error < 0)
|
|
errx(1, "metalog_emit: write error");
|
|
}
|
|
|
|
void
|
|
metalog_emit(const char *path, mode_t mode, uid_t uid, gid_t gid, int flags)
|
|
{
|
|
metalog_emit_record(path, NULL, mode, uid, gid, flags);
|
|
}
|
|
|
|
void
|
|
metalog_emit_symlink(const char *path, const char *target, mode_t mode,
|
|
uid_t uid, gid_t gid)
|
|
{
|
|
metalog_emit_record(path, target, mode, uid, gid, 0);
|
|
}
|