* 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.
- *
- * $FreeBSD$
*/
-#include <unistd.h>
-#include <fcntl.h>
+#ifndef lint
+static const char rcsid[] =
+ "$Id$";
+#endif /* not lint */
+
#include <ctype.h>
-#include <paths.h>
+#include <err.h>
+#include <fcntl.h>
#include <sys/param.h>
#include <dirent.h>
+#include <paths.h>
#include <termios.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
+#include <unistd.h>
#include <utmp.h>
#if defined(USE_MD5RAND)
#include <md5.h>
#define LOGNAMESIZE (MAXLOGNAME-1)
#endif
+static randinit;
+
static int print_user(struct passwd * pwd, int pretty);
static uid_t pw_uidpolicy(struct userconf * cnf, struct cargs * args);
static uid_t pw_gidpolicy(struct userconf * cnf, struct cargs * args, char *nam, gid_t prefer);
cnf->home[--l] = '\0';
if (l < 2 || *cnf->home != '/') /* Check for absolute path name */
- cmderr(EX_DATAERR, "invalid base directory for home '%s'\n", cnf->home);
+ errx(EX_DATAERR, "invalid base directory for home '%s'", cnf->home);
if (stat(cnf->home, &st) == -1) {
char dbuf[MAXPATHLEN];
goto direrr;
chown(dbuf, 0, 0);
} else if (!S_ISDIR(st.st_mode))
- cmderr(EX_OSFILE, "'%s' (root home parent) is not a directory\n", dbuf);
+ errx(EX_OSFILE, "'%s' (root home parent) is not a directory", dbuf);
*p = '/';
}
}
if (stat(dbuf, &st) == -1) {
if (mkdir(dbuf, 0755) == -1) {
- direrr: cmderr(EX_OSFILE, "mkdir '%s': %s\n", dbuf, strerror(errno));
+ direrr: err(EX_OSFILE, "mkdir '%s'", dbuf);
}
chown(dbuf, 0, 0);
}
} else if (!S_ISDIR(st.st_mode))
- cmderr(EX_OSFILE, "root home `%s' is not a directory\n", cnf->home);
+ errx(EX_OSFILE, "root home `%s' is not a directory", cnf->home);
}
p = arg->val;
if ((grp = getgrnam(p)) == NULL) {
if (!isdigit(*p) || (grp = getgrgid((gid_t) atoi(p))) == NULL)
- cmderr(EX_NOUSER, "group `%s' does not exist\n", p);
+ errx(EX_NOUSER, "group `%s' does not exist", p);
}
cnf->default_group = newstr(grp->gr_name);
}
for (p = strtok(arg->val, ", \t"); p != NULL; p = strtok(NULL, ", \t")) {
if ((grp = getgrnam(p)) == NULL) {
if (!isdigit(*p) || (grp = getgrgid((gid_t) atoi(p))) == NULL)
- cmderr(EX_NOUSER, "group `%s' does not exist\n", p);
+ errx(EX_NOUSER, "group `%s' does not exist", p);
}
if (extendarray(&cnf->groups, &cnf->numgroups, i + 2) != -1)
cnf->groups[i++] = newstr(grp->gr_name);
cnf->groups[i++] = NULL;
}
if ((arg = getarg(args, 'k')) != NULL) {
- if (stat(cnf->dotdir = arg->val, &st) == -1 || S_ISDIR(st.st_mode))
- cmderr(EX_OSFILE, "skeleton `%s' is not a directory or does not exist\n", cnf->dotdir);
+ if (stat(cnf->dotdir = arg->val, &st) == -1 || !S_ISDIR(st.st_mode))
+ errx(EX_OSFILE, "skeleton `%s' is not a directory or does not exist", cnf->dotdir);
}
if ((arg = getarg(args, 's')) != NULL)
cnf->shell_default = arg->val;
if (mode == M_ADD && getarg(args, 'D')) {
if (getarg(args, 'n') != NULL)
- cmderr(EX_DATAERR, "can't combine `-D' with `-n name'\n");
+ errx(EX_DATAERR, "can't combine `-D' with `-n name'");
if ((arg = getarg(args, 'u')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
if ((cnf->min_uid = (uid_t) atoi(p)) == 0)
cnf->min_uid = 1000;
arg = getarg(args, 'C');
if (write_userconfig(arg ? arg->val : NULL))
return EXIT_SUCCESS;
- perror("config update");
+ warn("config update");
return EX_IOERR;
}
if (mode == M_PRINT && getarg(args, 'a')) {
if (a_uid == NULL) {
if (a_name == NULL)
- cmderr(EX_DATAERR, "user name or id required\n");
+ errx(EX_DATAERR, "user name or id required");
/*
* Determine whether 'n' switch is name or uid - we don't
return print_user(&fakeuser, getarg(args, 'P') != NULL);
}
if (a_name == NULL)
- cmderr(EX_NOUSER, "no such uid `%s'\n", a_uid->val);
- cmderr(EX_NOUSER, "no such user `%s'\n", a_name->val);
+ errx(EX_NOUSER, "no such uid `%s'", a_uid->val);
+ errx(EX_NOUSER, "no such user `%s'", a_name->val);
}
if (a_name == NULL) /* May be needed later */
a_name = addarg(args, 'n', newstr(pwd->pw_name));
uid_t uid = pwd->pw_uid;
if (strcmp(pwd->pw_name, "root") == 0)
- cmderr(EX_DATAERR, "cannot remove user 'root'\n");
+ errx(EX_DATAERR, "cannot remove user 'root'");
/*
* Remove skey record from /etc/skeykeys
home[sizeof home - 1] = '\0';
if (!delpwent(pwd))
- cmderr(EX_IOERR, "Error updating passwd file: %s\n", strerror(errno));
+ err(EX_IOERR, "error updating passwd file");
if (cnf->nispasswd && *cnf->nispasswd=='/' && !delnispwent(cnf->nispasswd, a_name->val))
- perror("WARNING: NIS passwd update");
+ warn("WARNING: NIS passwd update");
editgroups(a_name->val, NULL);
*/
if ((arg = getarg(args, 'l')) != NULL) {
if (strcmp(pwd->pw_name, "root") == 0)
- cmderr(EX_DATAERR, "can't rename `root' account\n");
+ errx(EX_DATAERR, "can't rename `root' account");
pwd->pw_name = pw_checkname((u_char *)arg->val, 0);
}
if ((arg = getarg(args, 'u')) != NULL && isdigit(*arg->val)) {
pwd->pw_uid = (uid_t) atol(arg->val);
if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)
- cmderr(EX_DATAERR, "can't change uid of `root' account\n");
+ errx(EX_DATAERR, "can't change uid of `root' account");
if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
- fprintf(stderr, "WARNING: account `%s' will have a uid of 0 (superuser access!)\n", pwd->pw_name);
+ warnx("WARNING: account `%s' will have a uid of 0 (superuser access!)", pwd->pw_name);
}
if ((arg = getarg(args, 'g')) != NULL && pwd->pw_uid != 0) /* Already checked this */
pwd->pw_gid = (gid_t) getgrnam(cnf->default_group)->gr_gid;
time_t expire = parse_date(now, arg->val);
if (now == expire)
- cmderr(EX_DATAERR, "Invalid password change date `%s'\n", arg->val);
+ errx(EX_DATAERR, "invalid password change date `%s'", arg->val);
pwd->pw_change = expire;
}
}
time_t expire = parse_date(now, arg->val);
if (now == expire)
- cmderr(EX_DATAERR, "Invalid account expiry date `%s'\n", arg->val);
+ errx(EX_DATAERR, "invalid account expiry date `%s'", arg->val);
pwd->pw_expire = expire;
}
}
if ((arg = getarg(args, 'd')) != NULL) {
if (stat(pwd->pw_dir = arg->val, &st) == -1) {
if (getarg(args, 'm') == NULL && strcmp(pwd->pw_dir, "/nonexistent") != 0)
- fprintf(stderr, "WARNING: home `%s' does not exist\n", pwd->pw_dir);
+ warnx("WARNING: home `%s' does not exist", pwd->pw_dir);
} else if (!S_ISDIR(st.st_mode))
- fprintf(stderr, "WARNING: home `%s' is not a directory\n", pwd->pw_dir);
+ warnx("WARNING: home `%s' is not a directory", pwd->pw_dir);
}
if ((arg = getarg(args, 'w')) != NULL && getarg(args, 'h') == NULL)
} else {
if (a_name == NULL) /* Required */
- cmderr(EX_DATAERR, "login name required\n");
+ errx(EX_DATAERR, "login name required");
else if ((pwd = getpwnam(a_name->val)) != NULL) /* Exists */
- cmderr(EX_DATAERR, "login name `%s' already exists\n", a_name->val);
+ errx(EX_DATAERR, "login name `%s' already exists", a_name->val);
/*
* Now, set up defaults for a new user
pwd->pw_shell = pw_shellpolicy(cnf, args, NULL);
if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
- fprintf(stderr, "WARNING: new account `%s' has a uid of 0 (superuser access!)\n", pwd->pw_name);
+ warnx("WARNING: new account `%s' has a uid of 0 (superuser access!)", pwd->pw_name);
}
/*
fflush(stdout);
}
if (b < 0) {
- perror("-h file descriptor");
+ warn("-h file descriptor");
return EX_IOERR;
}
line[b] = '\0';
if ((p = strpbrk(line, " \t\r\n")) != NULL)
*p = '\0';
if (!*line)
- cmderr(EX_DATAERR, "empty password read on file descriptor %d\n", fd);
+ errx(EX_DATAERR, "empty password read on file descriptor %d", fd);
pwd->pw_passwd = pw_pwcrypt(line);
}
}
}
if (!r) {
- perror("password update");
+ warn("password update");
return EX_IOERR;
} else if (!r1) {
- perror("WARNING: NIS password update");
+ warn("WARNING: NIS password update");
/* Keep on trucking */
}
/* pwd may have been invalidated */
if ((pwd = getpwnam(a_name->val)) == NULL)
- cmderr(EX_NOUSER, "user '%s' disappeared during update\n", a_name->val);
+ errx(EX_NOUSER, "user '%s' disappeared during update", a_name->val);
grp = getgrgid(pwd->pw_gid);
pw_log(cnf, mode, W_USER, "%s(%ld):%s(%d):%s:%s:%s",
FILE *pfp = popen(_PATH_SENDMAIL " -t", "w");
if (pfp == NULL)
- perror("sendmail");
+ warn("sendmail");
else {
fprintf(pfp, "From: root\n" "To: %s\n" "Subject: Welcome!\n\n", pwd->pw_name);
while (fgets(line, sizeof(line), fp) != NULL) {
uid = (uid_t) atol(a_uid->val);
if ((pwd = getpwuid(uid)) != NULL && getarg(args, 'o') == NULL)
- cmderr(EX_DATAERR, "uid `%ld' has already been allocated\n", (long) pwd->pw_uid);
+ errx(EX_DATAERR, "uid `%ld' has already been allocated", (long) pwd->pw_uid);
} else {
struct bitmap bm;
* Another sanity check
*/
if (uid < cnf->min_uid || uid > cnf->max_uid)
- cmderr(EX_SOFTWARE, "unable to allocate a new uid - range fully used\n");
+ errx(EX_SOFTWARE, "unable to allocate a new uid - range fully used");
bm_dealloc(&bm);
}
return uid;
if ((grp = getgrnam(a_gid->val)) == NULL) {
gid = (gid_t) atol(a_gid->val);
if ((gid == 0 && !isdigit(*a_gid->val)) || (grp = getgrgid(gid)) == NULL)
- cmderr(EX_NOUSER, "group `%s' is not defined\n", a_gid->val);
+ errx(EX_NOUSER, "group `%s' is not defined", a_gid->val);
}
gid = grp->gr_gid;
} else if ((grp = getgrnam(nam)) != NULL && grp->gr_mem[0] == NULL) {
{
time_t result = 0;
time_t now = time(NULL);
- struct carg *arg = getarg(args, 'e');
+ struct carg *arg = getarg(args, 'p');
if (arg != NULL) {
if ((result = parse_date(now, arg->val)) == now)
- cmderr(EX_DATAERR, "invalid date/time `%s'\n", arg->val);
+ errx(EX_DATAERR, "invalid date/time `%s'", arg->val);
} else if (cnf->password_days > 0)
result = now + ((long) cnf->password_days * 86400L);
return result;
if (arg != NULL) {
if ((result = parse_date(now, arg->val)) == now)
- cmderr(EX_DATAERR, "invalid date/time `%s'\n", arg->val);
+ errx(EX_DATAERR, "invalid date/time `%s'", arg->val);
} else if (cnf->expire_days > 0)
result = now + ((long) cnf->expire_days * 86400L);
return result;
static char home[128];
if (cnf->home == NULL || *cnf->home == '\0')
- cmderr(EX_CONFIG, "no base home directory set\n");
+ errx(EX_CONFIG, "no base home directory set");
sprintf(home, "%s/%s", cnf->home, user);
return home;
}
}
}
if (sh == NULL)
- cmderr(EX_OSFILE, "can't find shell `%s' in shell paths\n", sh);
- cmderr(EX_CONFIG, "no default shell available or defined\n");
+ errx(EX_OSFILE, "can't find shell `%s' in shell paths", sh);
+ errx(EX_CONFIG, "no default shell available or defined");
return NULL;
}
}
/*
* Calculate a salt value
*/
- srandom((unsigned) (time(NULL) ^ getpid()));
+ if (!randinit) {
+ randinit = 1;
+#ifdef __FreeBSD__
+ srandomdev();
+#else
+ srandom((unsigned long) (time(NULL) ^ getpid()));
+#endif
+ }
for (i = 0; i < 8; i++)
salt[i] = chars[random() % 63];
salt[i] = '\0';
return strcpy(buf, crypt(password, salt));
}
-#if defined(__FreeBSD__)
-
#if defined(USE_MD5RAND)
u_char *
pw_getrand(u_char *buf, int len) /* cryptographically secure rng */
return buf;
}
-#else /* Use random device (preferred) */
-
-static u_char *
-pw_getrand(u_char *buf, int len)
-{
- int fd;
- fd = open("/dev/urandom", O_RDONLY);
- if (fd==-1)
- cmderr(EX_OSFILE, "can't open /dev/urandom: %s\n", strerror(errno));
- else if (read(fd, buf, len)!=len)
- cmderr(EX_IOERR, "read error on /dev/urandom\n");
- close(fd);
- return buf;
-}
-
-#endif
-
#else /* Portable version */
static u_char *
int i;
for (i = 0; i < len; i++) {
- unsigned val = random();
+ unsigned long val = random();
/* Use all bits in the random value */
buf[i]=(u_char)((val >> 24) ^ (val >> 16) ^ (val >> 8) ^ val);
}
switch (cnf->default_password) {
case -1: /* Random password */
- srandom((unsigned) (time(NULL) ^ getpid()));
+ if (!randinit) {
+ randinit = 1;
+#ifdef __FreeBSD__
+ srandomdev();
+#else
+ srandom((unsigned long) (time(NULL) ^ getpid()));
+#endif
+ }
l = (random() % 8 + 8); /* 8 - 16 chars */
pw_getrand(rndbuf, l);
for (i = 0; i < l; i++)
if (strchr(notch, name[l]) != NULL || name[l] < ' ' || name[l] == 127 ||
(!gecos && l==0 && name[l] == '-') || /* leading '-' */
(!gecos && name[l] & 0x80)) /* 8-bit */
- cmderr(EX_DATAERR, (name[l] >= ' ' && name[l] < 127)
- ? "invalid character `%c' in field\n"
- : "invalid character 0x%02x in field\n",
+ errx(EX_DATAERR, (name[l] >= ' ' && name[l] < 127)
+ ? "invalid character `%c' in field"
+ : "invalid character 0x%02x in field",
name[l]);
++l;
}
if (!gecos && l > LOGNAMESIZE)
- cmderr(EX_DATAERR, "name too long `%s'\n", name);
+ errx(EX_DATAERR, "name too long `%s'", name);
return (char *)name;
}
git.ckatri.com / pw-darwin.git / blobdiff