svn commit: r286196 - in head/usr.sbin/pw: . tests
Baptiste Daroussin
bapt at FreeBSD.org
Sun Aug 2 12:47:53 UTC 2015
Author: bapt
Date: Sun Aug 2 12:47:50 2015
New Revision: 286196
URL: https://svnweb.freebsd.org/changeset/base/286196
Log:
Rewrite parsing subcommands arguments of pw(8)
Now each subcommands checks its arguments in a dedicated functions.
This helps improving input validation, code readability/maintainability
While here:
- Add a -y option to pw userdel/usermod so it can maintain NIS servers if
nispasswd is not defined in pw.conf(5)
- Allow pw -r <rootdir> to remove directory with userdel -r
- Fix bug when renaming a user which was not renaming the user name it groups
it is a member of.
- Only parse pw.conf(5) when needed.
Added:
head/usr.sbin/pw/pw_utils.c (contents, props changed)
Modified:
head/usr.sbin/pw/Makefile
head/usr.sbin/pw/pw.c
head/usr.sbin/pw/pw.h
head/usr.sbin/pw/pw_conf.c
head/usr.sbin/pw/pw_group.c
head/usr.sbin/pw/pw_nis.c
head/usr.sbin/pw/pw_user.c
head/usr.sbin/pw/pwupd.h
head/usr.sbin/pw/strtounum.c
head/usr.sbin/pw/tests/pw_groupdel.sh
head/usr.sbin/pw/tests/pw_useradd.sh
head/usr.sbin/pw/tests/pw_userdel.sh
head/usr.sbin/pw/tests/pw_usermod.sh
Modified: head/usr.sbin/pw/Makefile
==============================================================================
--- head/usr.sbin/pw/Makefile Sun Aug 2 12:40:56 2015 (r286195)
+++ head/usr.sbin/pw/Makefile Sun Aug 2 12:47:50 2015 (r286196)
@@ -3,7 +3,8 @@
PROG= pw
MAN= pw.conf.5 pw.8
SRCS= pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \
- grupd.c pwupd.c psdate.c bitmap.c cpdir.c rm_r.c strtounum.c
+ grupd.c pwupd.c psdate.c bitmap.c cpdir.c rm_r.c strtounum.c \
+ pw_utils.c
WARNS?= 3
Modified: head/usr.sbin/pw/pw.c
==============================================================================
--- head/usr.sbin/pw/pw.c Sun Aug 2 12:40:56 2015 (r286195)
+++ head/usr.sbin/pw/pw.c Sun Aug 2 12:47:50 2015 (r286196)
@@ -37,9 +37,6 @@ static const char rcsid[] =
#include <sys/wait.h>
#include "pw.h"
-#if !defined(_PATH_YP)
-#define _PATH_YP "/var/yp/"
-#endif
const char *Modes[] = {
"add", "del", "mod", "show", "next",
NULL};
@@ -85,55 +82,39 @@ struct pwf VPWF =
vgetgrnam,
};
-struct pwconf conf;
-
-static struct cargs arglist;
+static int (*cmdfunc[W_NUM][M_NUM])(int argc, char **argv, char *_name) = {
+ { /* user */
+ pw_user_add,
+ pw_user_del,
+ pw_user_mod,
+ pw_user_show,
+ pw_user_next,
+ pw_user_lock,
+ pw_user_unlock,
+ },
+ { /* group */
+ pw_group_add,
+ pw_group_del,
+ pw_group_mod,
+ pw_group_show,
+ pw_group_next,
+ }
+};
-static int getindex(const char *words[], const char *word);
-static void cmdhelp(int mode, int which);
+struct pwconf conf;
+static int getindex(const char *words[], const char *word);
+static void cmdhelp(int mode, int which);
int
main(int argc, char *argv[])
{
- int ch;
- int mode = -1;
- int which = -1;
- long id = -1;
- char *config = NULL;
+ int mode = -1, which = -1, tmp;
struct stat st;
- const char *errstr;
- char arg, *name;
+ char arg, *arg1;
bool relocated, nis;
- static const char *opts[W_NUM][M_NUM] =
- {
- { /* user */
- "R:V:C:qn:u:c:d:e:p:g:G:mM:k:s:oL:i:w:h:H:Db:NPy:Y",
- "R:V:C:qn:u:rY",
- "R:V:C:qn:u:c:d:e:p:g:G:mM:l:k:s:w:L:h:H:FNPY",
- "R:V:C:qn:u:FPa7",
- "R:V:C:q",
- "R:V:C:q",
- "R:V:C:q"
- },
- { /* grp */
- "R:V:C:qn:g:h:H:M:opNPY",
- "R:V:C:qn:g:Y",
- "R:V:C:qn:d:g:l:h:H:FM:m:NPY",
- "R:V:C:qn:g:FPa",
- "R:V:C:q"
- }
- };
-
- static int (*funcs[W_NUM]) (int _mode, char *_name, long _id,
- struct cargs * _args) =
- { /* Request handlers */
- pw_user,
- pw_group
- };
-
- name = NULL;
+ arg1 = NULL;
relocated = nis = false;
memset(&conf, 0, sizeof(conf));
strlcpy(conf.rootdir, "/", sizeof(conf.rootdir));
@@ -141,17 +122,13 @@ main(int argc, char *argv[])
conf.fd = -1;
conf.checkduplicate = true;
- LIST_INIT(&arglist);
-
- (void)setlocale(LC_ALL, "");
+ setlocale(LC_ALL, "");
/*
* Break off the first couple of words to determine what exactly
* we're being asked to do
*/
while (argc > 1) {
- int tmp;
-
if (*argv[1] == '-') {
/*
* Special case, allow pw -V<dir> <operation> [args] for scripts etc.
@@ -197,15 +174,9 @@ main(int argc, char *argv[])
mode = tmp % M_NUM;
} else if (strcmp(argv[1], "help") == 0 && argv[2] == NULL)
cmdhelp(mode, which);
- else if (which != -1 && mode != -1) {
- if (strspn(argv[1], "0123456789") == strlen(argv[1])) {
- id = strtounum(argv[1], 0, UID_MAX, &errstr);
- if (errstr != NULL)
- errx(EX_USAGE, "Bad id '%s': %s",
- argv[1], errstr);
- } else
- name = argv[1];
- } else
+ else if (which != -1 && mode != -1)
+ arg1 = argv[1];
+ else
errx(EX_USAGE, "unknown keyword `%s'", argv[1]);
++argv;
--argc;
@@ -220,193 +191,22 @@ main(int argc, char *argv[])
conf.rootfd = open(conf.rootdir, O_DIRECTORY|O_CLOEXEC);
if (conf.rootfd == -1)
errx(EXIT_FAILURE, "Unable to open '%s'", conf.rootdir);
- conf.which = which;
- /*
- * We know which mode we're in and what we're about to do, so now
- * let's dispatch the remaining command line args in a genric way.
- */
- optarg = NULL;
-
- while ((ch = getopt(argc, argv, opts[which][mode])) != -1) {
- switch (ch) {
- case '?':
- errx(EX_USAGE, "unknown switch");
- break;
- case '7':
- conf.v7 = true;
- break;
- case 'C':
- conf.config = optarg;
- config = conf.config;
- break;
- case 'F':
- conf.force = true;
- break;
- case 'N':
- conf.dryrun = true;
- break;
- case 'l':
- if (strlen(optarg) >= MAXLOGNAME)
- errx(EX_USAGE, "new name too long: %s", optarg);
- conf.newname = optarg;
- break;
- case 'P':
- conf.pretty = true;
- break;
- case 'Y':
- nis = true;
- break;
- case 'a':
- conf.all = true;
- break;
- case 'c':
- conf.gecos = pw_checkname(optarg, 1);
- break;
- case 'g':
- if (which == 0) { /* for user* */
- addarg(&arglist, 'g', optarg);
- break;
- }
- if (strspn(optarg, "0123456789") != strlen(optarg))
- errx(EX_USAGE, "-g expects a number");
- id = strtounum(optarg, 0, GID_MAX, &errstr);
- if (errstr != NULL)
- errx(EX_USAGE, "Bad id '%s': %s", optarg,
- errstr);
- break;
- case 'u':
- if (strspn(optarg, "0123456789,") != strlen(optarg))
- errx(EX_USAGE, "-u expects a number");
- if (strchr(optarg, ',') != NULL) {
- addarg(&arglist, 'u', optarg);
- break;
- }
- id = strtounum(optarg, 0, UID_MAX, &errstr);
- if (errstr != NULL)
- errx(EX_USAGE, "Bad id '%s': %s", optarg,
- errstr);
- break;
- case 'n':
- name = optarg;
- break;
- case 'H':
- if (conf.fd != -1)
- errx(EX_USAGE, "'-h' and '-H' are mutually "
- "exclusive options");
- conf.precrypted = true;
- if (strspn(optarg, "0123456789") != strlen(optarg))
- errx(EX_USAGE, "'-H' expects a file descriptor");
-
- conf.fd = strtonum(optarg, 0, INT_MAX, &errstr);
- if (errstr != NULL)
- errx(EX_USAGE, "Bad file descriptor '%s': %s",
- optarg, errstr);
- break;
- case 'h':
- if (conf.fd != -1)
- errx(EX_USAGE, "'-h' and '-H' are mutually "
- "exclusive options");
-
- if (strcmp(optarg, "-") == 0)
- conf.fd = '-';
- else if (strspn(optarg, "0123456789") == strlen(optarg)) {
- conf.fd = strtonum(optarg, 0, INT_MAX, &errstr);
- if (errstr != NULL)
- errx(EX_USAGE, "'-h' expects a "
- "file descriptor or '-'");
- } else
- errx(EX_USAGE, "'-h' expects a file "
- "descriptor or '-'");
- break;
- case 'o':
- conf.checkduplicate = false;
- break;
- case 'q':
- conf.quiet = true;
- break;
- case 'r':
- conf.deletehome = true;
- break;
- default:
- addarg(&arglist, ch, optarg);
- break;
- }
- optarg = NULL;
- }
-
- if (name != NULL && strlen(name) >= MAXLOGNAME)
- errx(EX_USAGE, "name too long: %s", name);
-
- /*
- * Must be root to attempt an update
- */
- if (geteuid() != 0 && mode != M_PRINT && mode != M_NEXT && !conf.dryrun)
- errx(EX_NOPERM, "you must be root to run this program");
-
- /*
- * We should immediately look for the -q 'quiet' switch so that we
- * don't bother with extraneous errors
- */
- if (conf.quiet)
- freopen(_PATH_DEVNULL, "w", stderr);
-
- /*
- * Set our base working path if not overridden
- */
-
- if (config == NULL) { /* Only override config location if -C not specified */
- asprintf(&config, "%s/pw.conf", conf.etcpath);
- if (config == NULL)
- errx(EX_OSERR, "out of memory");
- }
-
- /*
- * Now, let's do the common initialisation
- */
- conf.userconf = read_userconfig(config);
-
- ch = funcs[which] (mode, name, id, &arglist);
-
- /*
- * If everything went ok, and we've been asked to update
- * the NIS maps, then do it now
- */
- if (ch == EXIT_SUCCESS && nis) {
- pid_t pid;
- fflush(NULL);
- if (chdir(_PATH_YP) == -1)
- warn("chdir(" _PATH_YP ")");
- else if ((pid = fork()) == -1)
- warn("fork()");
- else if (pid == 0) {
- /* Is make anywhere else? */
- execlp("/usr/bin/make", "make", (char *)NULL);
- _exit(1);
- } else {
- int i;
- waitpid(pid, &i, 0);
- if ((i = WEXITSTATUS(i)) != 0)
- errx(ch, "make exited with status %d", i);
- else
- pw_log(conf.userconf, mode, which, "NIS maps updated");
- }
- }
- return ch;
+ return (cmdfunc[which][mode](argc, argv, arg1));
}
static int
getindex(const char *words[], const char *word)
{
- int i = 0;
+ int i = 0;
while (words[i]) {
if (strcmp(words[i], word) == 0)
- return i;
+ return (i);
i++;
}
- return -1;
+ return (-1);
}
@@ -456,7 +256,7 @@ cmdhelp(int mode, int which)
" Setting defaults:\n"
"\t-V etcdir alternate /etc location\n"
"\t-R rootir alternate root directory\n"
- "\t-D set user defaults\n"
+ "\t-D set user defaults\n"
"\t-b dir default home root dir\n"
"\t-e period default expiry period\n"
"\t-p period default password change period\n"
@@ -476,6 +276,7 @@ cmdhelp(int mode, int which)
"\t-n name login name\n"
"\t-u uid user id\n"
"\t-Y update NIS maps\n"
+ "\t-y path set NIS passwd file path\n"
"\t-r remove home & contents\n",
"usage: pw usermod [uid|name] [switches]\n"
"\t-V etcdir alternate /etc location\n"
@@ -500,6 +301,7 @@ cmdhelp(int mode, int which)
"\t-h fd read password on fd\n"
"\t-H fd read encrypted password on fd\n"
"\t-Y update NIS maps\n"
+ "\t-y path set NIS passwd file path\n"
"\t-N no update\n",
"usage: pw usershow [uid|name] [switches]\n"
"\t-V etcdir alternate /etc location\n"
@@ -576,31 +378,3 @@ cmdhelp(int mode, int which)
}
exit(EXIT_FAILURE);
}
-
-struct carg *
-getarg(struct cargs * _args, int ch)
-{
- struct carg *c;
-
- if (_args == NULL)
- return (NULL);
-
- c = LIST_FIRST(_args);
-
- while (c != NULL && c->ch != ch)
- c = LIST_NEXT(c, list);
- return c;
-}
-
-struct carg *
-addarg(struct cargs * _args, int ch, char *argstr)
-{
- struct carg *ca = malloc(sizeof(struct carg));
-
- if (ca == NULL)
- errx(EX_OSERR, "out of memory");
- ca->ch = ch;
- ca->val = argstr;
- LIST_INSERT_HEAD(_args, ca, list);
- return ca;
-}
Modified: head/usr.sbin/pw/pw.h
==============================================================================
--- head/usr.sbin/pw/pw.h Sun Aug 2 12:40:56 2015 (r286195)
+++ head/usr.sbin/pw/pw.h Sun Aug 2 12:47:50 2015 (r286196)
@@ -78,21 +78,41 @@ LIST_HEAD(cargs, carg);
#define _UC_MAXLINE 1024
#define _UC_MAXSHELLS 32
+struct userconf *get_userconfig(const char *cfg);
struct userconf *read_userconfig(char const * file);
-int write_userconfig(char const * file);
+int write_userconfig(struct userconf *cnf, char const * file);
struct carg *addarg(struct cargs * _args, int ch, char *argstr);
struct carg *getarg(struct cargs * _args, int ch);
-int pw_user(int mode, char *name, long id, struct cargs * _args);
-int pw_usernext(struct userconf *cnf, bool quiet);
-int pw_group(int mode, char *name, long id, struct cargs * _args);
+int pw_group_add(int argc, char **argv, char *name);
+int pw_group_del(int argc, char **argv, char *name);
+int pw_group_mod(int argc, char **argv, char *name);
+int pw_group_next(int argc, char **argv, char *name);
+int pw_group_show(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_add(int argc, char **argv, char *name);
+int pw_user_del(int argc, char **argv, char *name);
+int pw_user_lock(int argc, char **argv, char *name);
+int pw_user_mod(int argc, char **argv, char *name);
+int pw_user_next(int argc, char **argv, char *name);
+int pw_user_show(int argc, char **argv, char *name);
+int pw_user_unlock(int argc, char **argv, char *name);
int pw_groupnext(struct userconf *cnf, bool quiet);
char *pw_checkname(char *name, int gecos);
+uintmax_t pw_checkid(char *nptr, uintmax_t maxval);
+int pw_checkfd(char *nptr);
int addnispwent(const char *path, struct passwd *pwd);
int delnispwent(const char *path, const char *login);
int chgnispwent(const char *path, const char *login, struct passwd *pwd);
+int groupadd(struct userconf *, char *name, gid_t id, char *members, int fd,
+ bool dryrun, bool pretty, bool precrypted);
+
+int nis_update(void);
+
int boolean_val(char const * str, int dflt);
char const *boolean_str(int val);
char *newstr(char const * p);
Modified: head/usr.sbin/pw/pw_conf.c
==============================================================================
--- head/usr.sbin/pw/pw_conf.c Sun Aug 2 12:40:56 2015 (r286195)
+++ head/usr.sbin/pw/pw_conf.c Sun Aug 2 12:47:50 2015 (r286196)
@@ -235,9 +235,6 @@ read_userconfig(char const * file)
buf = NULL;
linecap = 0;
- config.groups = sl_init();
- if (config.groups == NULL)
- err(1, "sl_init()");
if (file == NULL)
file = _PATH_PW_CONF;
@@ -316,8 +313,11 @@ read_userconfig(char const * file)
? NULL : newstr(q);
break;
case _UC_EXTRAGROUPS:
- for (i = 0; q != NULL; q = strtok(NULL, toks))
+ for (i = 0; q != NULL; q = strtok(NULL, toks)) {
+ if (config.groups == NULL)
+ config.groups = sl_init();
sl_add(config.groups, newstr(q));
+ }
break;
case _UC_DEFAULTCLASS:
config.default_class = (q == NULL || !boolean_val(q, 1))
@@ -391,7 +391,7 @@ read_userconfig(char const * file)
int
-write_userconfig(char const * file)
+write_userconfig(struct userconf *cnf, const char *file)
{
int fd;
int i, j;
@@ -416,40 +416,39 @@ write_userconfig(char const * file)
sbuf_clear(buf);
switch (i) {
case _UC_DEFAULTPWD:
- sbuf_cat(buf, boolean_str(config.default_password));
+ sbuf_cat(buf, boolean_str(cnf->default_password));
break;
case _UC_REUSEUID:
- sbuf_cat(buf, boolean_str(config.reuse_uids));
+ sbuf_cat(buf, boolean_str(cnf->reuse_uids));
break;
case _UC_REUSEGID:
- sbuf_cat(buf, boolean_str(config.reuse_gids));
+ sbuf_cat(buf, boolean_str(cnf->reuse_gids));
break;
case _UC_NISPASSWD:
- sbuf_cat(buf, config.nispasswd ? config.nispasswd :
- "");
+ sbuf_cat(buf, cnf->nispasswd ? cnf->nispasswd : "");
quote = 0;
break;
case _UC_DOTDIR:
- sbuf_cat(buf, config.dotdir ? config.dotdir :
+ sbuf_cat(buf, cnf->dotdir ? cnf->dotdir :
boolean_str(0));
break;
case _UC_NEWMAIL:
- sbuf_cat(buf, config.newmail ? config.newmail :
+ sbuf_cat(buf, cnf->newmail ? cnf->newmail :
boolean_str(0));
break;
case _UC_LOGFILE:
- sbuf_cat(buf, config.logfile ? config.logfile :
+ sbuf_cat(buf, cnf->logfile ? cnf->logfile :
boolean_str(0));
break;
case _UC_HOMEROOT:
- sbuf_cat(buf, config.home);
+ sbuf_cat(buf, cnf->home);
break;
case _UC_HOMEMODE:
- sbuf_printf(buf, "%04o", config.homemode);
+ sbuf_printf(buf, "%04o", cnf->homemode);
quote = 0;
break;
case _UC_SHELLPATH:
- sbuf_cat(buf, config.shelldir);
+ sbuf_cat(buf, cnf->shelldir);
break;
case _UC_SHELLS:
for (j = 0; j < _UC_MAXSHELLS &&
@@ -459,46 +458,46 @@ write_userconfig(char const * file)
quote = 0;
break;
case _UC_DEFAULTSHELL:
- sbuf_cat(buf, config.shell_default ?
- config.shell_default : bourne_shell);
+ sbuf_cat(buf, cnf->shell_default ?
+ cnf->shell_default : bourne_shell);
break;
case _UC_DEFAULTGROUP:
- sbuf_cat(buf, config.default_group ?
- config.default_group : "");
+ sbuf_cat(buf, cnf->default_group ?
+ cnf->default_group : "");
break;
case _UC_EXTRAGROUPS:
- for (j = 0; config.groups != NULL &&
- j < (int)config.groups->sl_cur; j++)
+ for (j = 0; cnf->groups != NULL &&
+ j < (int)cnf->groups->sl_cur; j++)
sbuf_printf(buf, "%s\"%s\"", j ?
- "," : "", config.groups->sl_str[j]);
+ "," : "", cnf->groups->sl_str[j]);
quote = 0;
break;
case _UC_DEFAULTCLASS:
- sbuf_cat(buf, config.default_class ?
- config.default_class : "");
+ sbuf_cat(buf, cnf->default_class ?
+ cnf->default_class : "");
break;
case _UC_MINUID:
- sbuf_printf(buf, "%ju", (uintmax_t)config.min_uid);
+ sbuf_printf(buf, "%ju", (uintmax_t)cnf->min_uid);
quote = 0;
break;
case _UC_MAXUID:
- sbuf_printf(buf, "%ju", (uintmax_t)config.max_uid);
+ sbuf_printf(buf, "%ju", (uintmax_t)cnf->max_uid);
quote = 0;
break;
case _UC_MINGID:
- sbuf_printf(buf, "%ju", (uintmax_t)config.min_gid);
+ sbuf_printf(buf, "%ju", (uintmax_t)cnf->min_gid);
quote = 0;
break;
case _UC_MAXGID:
- sbuf_printf(buf, "%ju", (uintmax_t)config.max_gid);
+ sbuf_printf(buf, "%ju", (uintmax_t)cnf->max_gid);
quote = 0;
break;
case _UC_EXPIRE:
- sbuf_printf(buf, "%d", config.expire_days);
+ sbuf_printf(buf, "%ld", cnf->expire_days);
quote = 0;
break;
case _UC_PASSWORD:
- sbuf_printf(buf, "%d", config.password_days);
+ sbuf_printf(buf, "%ld", cnf->password_days);
quote = 0;
break;
case _UC_NONE:
Modified: head/usr.sbin/pw/pw_group.c
==============================================================================
--- head/usr.sbin/pw/pw_group.c Sun Aug 2 12:40:56 2015 (r286195)
+++ head/usr.sbin/pw/pw_group.c Sun Aug 2 12:47:50 2015 (r286196)
@@ -31,47 +31,50 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
+#include <grp.h>
#include <inttypes.h>
-#include <termios.h>
+#include <libutil.h>
+#include <paths.h>
#include <stdbool.h>
+#include <termios.h>
#include <unistd.h>
-#include <grp.h>
-#include <libutil.h>
#include "pw.h"
#include "bitmap.h"
-
static struct passwd *lookup_pwent(const char *user);
static void delete_members(struct group *grp, char *list);
-static int print_group(struct group * grp);
-static gid_t gr_gidpolicy(struct userconf * cnf, long id);
+static int print_group(struct group * grp, bool pretty);
+static gid_t gr_gidpolicy(struct userconf * cnf, intmax_t id);
static void
-set_passwd(struct group *grp, bool update)
+grp_set_passwd(struct group *grp, bool update, int fd, bool precrypted)
{
int b;
int istty;
struct termios t, n;
char *p, line[256];
- if (conf.fd == '-') {
+ if (fd == -1)
+ return;
+
+ if (fd == '-') {
grp->gr_passwd = "*"; /* No access */
return;
}
- if ((istty = isatty(conf.fd))) {
+ if ((istty = isatty(fd))) {
n = t;
/* Disable echo */
n.c_lflag &= ~(ECHO);
- tcsetattr(conf.fd, TCSANOW, &n);
+ tcsetattr(fd, TCSANOW, &n);
printf("%sassword for group %s:", update ? "New p" : "P",
grp->gr_name);
fflush(stdout);
}
- b = read(conf.fd, line, sizeof(line) - 1);
+ b = read(fd, line, sizeof(line) - 1);
if (istty) { /* Restore state */
- tcsetattr(conf.fd, TCSANOW, &t);
+ tcsetattr(fd, TCSANOW, &t);
fputc('\n', stdout);
fflush(stdout);
}
@@ -83,7 +86,7 @@ set_passwd(struct group *grp, bool updat
if (!*line)
errx(EX_DATAERR, "empty password read on file descriptor %d",
conf.fd);
- if (conf.precrypted) {
+ if (precrypted) {
if (strchr(line, ':') != 0)
errx(EX_DATAERR, "wrong encrypted passwrd");
grp->gr_passwd = line;
@@ -103,193 +106,24 @@ pw_groupnext(struct userconf *cnf, bool
return (EXIT_SUCCESS);
}
-static int
-pw_groupshow(const char *name, long id, struct group *fakegroup)
-{
- struct group *grp = NULL;
-
- if (id < 0 && name == NULL && !conf.all)
- errx(EX_DATAERR, "groupname or id or '-a' required");
-
- if (conf.all) {
- SETGRENT();
- while ((grp = GETGRENT()) != NULL)
- print_group(grp);
- ENDGRENT();
-
- return (EXIT_SUCCESS);
- }
-
- grp = (name != NULL) ? GETGRNAM(name) : GETGRGID(id);
- if (grp == NULL) {
- if (conf.force) {
- grp = fakegroup;
- } else {
- if (name == NULL)
- errx(EX_DATAERR, "unknown gid `%ld'", id);
- errx(EX_DATAERR, "unknown group `%s'", name);
- }
- }
-
- return (print_group(grp));
-}
-
-static int
-pw_groupdel(const char *name, long id)
+static struct group *
+getgroup(char *name, intmax_t id, bool fatal)
{
- struct group *grp = NULL;
- int rc;
+ struct group *grp;
+ if (id < 0 && name == NULL)
+ errx(EX_DATAERR, "groupname or id required");
grp = (name != NULL) ? GETGRNAM(name) : GETGRGID(id);
if (grp == NULL) {
+ if (!fatal)
+ return (NULL);
if (name == NULL)
- errx(EX_DATAERR, "unknown gid `%ld'", id);
+ errx(EX_DATAERR, "unknown gid `%ju'", id);
errx(EX_DATAERR, "unknown group `%s'", name);
}
-
- rc = delgrent(grp);
- if (rc == -1)
- err(EX_IOERR, "group '%s' not available (NIS?)", name);
- else if (rc != 0)
- err(EX_IOERR, "group update");
- pw_log(conf.userconf, M_DELETE, W_GROUP, "%s(%ld) removed", name, id);
-
- return (EXIT_SUCCESS);
-}
-
-int
-pw_group(int mode, char *name, long id, struct cargs * args)
-{
- int rc;
- struct carg *arg;
- struct group *grp = NULL;
- struct userconf *cnf = conf.userconf;
-
- static struct group fakegroup =
- {
- "nogroup",
- "*",
- -1,
- NULL
- };
-
- if (mode == M_NEXT)
- return (pw_groupnext(cnf, conf.quiet));
-
- if (mode == M_PRINT)
- return (pw_groupshow(name, id, &fakegroup));
-
- if (mode == M_DELETE)
- return (pw_groupdel(name, id));
-
- if (mode == M_LOCK || mode == M_UNLOCK)
- errx(EX_USAGE, "'lock' command is not available for groups");
-
- if (id < 0 && name == NULL)
- errx(EX_DATAERR, "group name or id required");
-
- grp = (name != NULL) ? GETGRNAM(name) : GETGRGID(id);
-
- if (mode == M_UPDATE) {
- if (name == NULL && grp == NULL) /* Try harder */
- grp = GETGRGID(id);
-
- if (grp == NULL) {
- if (name == NULL)
- errx(EX_DATAERR, "unknown group `%s'", name);
- else
- errx(EX_DATAERR, "unknown group `%ld'", id);
- }
- if (name == NULL) /* Needed later */
- name = grp->gr_name;
-
- if (id > 0)
- grp->gr_gid = (gid_t) id;
-
- if (conf.newname != NULL)
- grp->gr_name = pw_checkname(conf.newname, 0);
- } else {
- if (name == NULL) /* Required */
- errx(EX_DATAERR, "group name required");
- else if (grp != NULL) /* Exists */
- errx(EX_DATAERR, "group name `%s' already exists", name);
-
- grp = &fakegroup;
- grp->gr_name = pw_checkname(name, 0);
- grp->gr_passwd = "*";
- grp->gr_gid = gr_gidpolicy(cnf, id);
- grp->gr_mem = NULL;
- }
-
- /*
- * This allows us to set a group password Group passwords is an
- * antique idea, rarely used and insecure (no secure database) Should
- * be discouraged, but it is apparently still supported by some
- * software.
- */
-
- if (conf.which == W_GROUP && conf.fd != -1)
- set_passwd(grp, mode == M_UPDATE);
-
- if (((arg = getarg(args, 'M')) != NULL ||
- (arg = getarg(args, 'd')) != NULL ||
- (arg = getarg(args, 'm')) != NULL) && arg->val) {
- char *p;
- struct passwd *pwd;
-
- /* Make sure this is not stay NULL with -M "" */
- if (arg->ch == 'd')
- delete_members(grp, arg->val);
- else if (arg->ch == 'M')
- grp->gr_mem = NULL;
-
- for (p = strtok(arg->val, ", \t"); arg->ch != 'd' && p != NULL;
- p = strtok(NULL, ", \t")) {
- int j;
-
- /*
- * Check for duplicates
- */
- pwd = lookup_pwent(p);
- for (j = 0; grp->gr_mem != NULL && grp->gr_mem[j] != NULL; j++) {
- if (strcmp(grp->gr_mem[j], pwd->pw_name) == 0)
- break;
- }
- if (grp->gr_mem != NULL && grp->gr_mem[j] != NULL)
- continue;
- grp = gr_add(grp, pwd->pw_name);
- }
- }
-
- if (conf.dryrun)
- return print_group(grp);
-
- if (mode == M_ADD && (rc = addgrent(grp)) != 0) {
- if (rc == -1)
- errx(EX_IOERR, "group '%s' already exists",
- grp->gr_name);
- else
- err(EX_IOERR, "group update");
- } else if (mode == M_UPDATE && (rc = chggrent(name, grp)) != 0) {
- if (rc == -1)
- errx(EX_IOERR, "group '%s' not available (NIS?)",
- grp->gr_name);
- else
- err(EX_IOERR, "group update");
- }
-
- if (conf.newname != NULL)
- name = conf.newname;
- /* grp may have been invalidated */
- if ((grp = GETGRNAM(name)) == NULL)
- errx(EX_SOFTWARE, "group disappeared during update");
-
- pw_log(cnf, mode, W_GROUP, "%s(%ju)", grp->gr_name, (uintmax_t)grp->gr_gid);
-
- return EXIT_SUCCESS;
+ return (grp);
}
-
/*
* Lookup a passwd entry using a name or UID.
*/
@@ -332,11 +166,11 @@ delete_members(struct group *grp, char *
}
}
-
-static gid_t
-gr_gidpolicy(struct userconf * cnf, long id)
+static gid_t
+gr_gidpolicy(struct userconf * cnf, intmax_t id)
{
struct group *grp;
+ struct bitmap bm;
gid_t gid = (gid_t) - 1;
/*
@@ -347,66 +181,59 @@ gr_gidpolicy(struct userconf * cnf, long
if ((grp = GETGRGID(gid)) != NULL && conf.checkduplicate)
errx(EX_DATAERR, "gid `%ju' has already been allocated", (uintmax_t)grp->gr_gid);
- } else {
- struct bitmap bm;
+ return (gid);
+ }
- /*
- * We need to allocate the next available gid under one of
- * two policies a) Grab the first unused gid b) Grab the
- * highest possible unused gid
- */
- if (cnf->min_gid >= cnf->max_gid) { /* Sanity claus^H^H^H^Hheck */
- cnf->min_gid = 1000;
- cnf->max_gid = 32000;
- }
- bm = bm_alloc(cnf->max_gid - cnf->min_gid + 1);
+ /*
+ * We need to allocate the next available gid under one of
+ * two policies a) Grab the first unused gid b) Grab the
+ * highest possible unused gid
+ */
+ if (cnf->min_gid >= cnf->max_gid) { /* Sanity claus^H^H^H^Hheck */
+ cnf->min_gid = 1000;
+ cnf->max_gid = 32000;
+ }
+ bm = bm_alloc(cnf->max_gid - cnf->min_gid + 1);
- /*
- * Now, let's fill the bitmap from the password file
- */
- SETGRENT();
- while ((grp = GETGRENT()) != NULL)
- if ((gid_t)grp->gr_gid >= (gid_t)cnf->min_gid &&
- (gid_t)grp->gr_gid <= (gid_t)cnf->max_gid)
- bm_setbit(&bm, grp->gr_gid - cnf->min_gid);
- ENDGRENT();
+ /*
+ * Now, let's fill the bitmap from the password file
+ */
+ SETGRENT();
+ while ((grp = GETGRENT()) != NULL)
+ if ((gid_t)grp->gr_gid >= (gid_t)cnf->min_gid &&
+ (gid_t)grp->gr_gid <= (gid_t)cnf->max_gid)
+ bm_setbit(&bm, grp->gr_gid - cnf->min_gid);
+ ENDGRENT();
- /*
- * Then apply the policy, with fallback to reuse if necessary
- */
- if (cnf->reuse_gids)
+ /*
+ * Then apply the policy, with fallback to reuse if necessary
+ */
+ if (cnf->reuse_gids)
+ gid = (gid_t) (bm_firstunset(&bm) + cnf->min_gid);
+ else {
+ gid = (gid_t) (bm_lastset(&bm) + 1);
+ if (!bm_isset(&bm, gid))
+ gid += cnf->min_gid;
+ else
gid = (gid_t) (bm_firstunset(&bm) + cnf->min_gid);
- else {
- gid = (gid_t) (bm_lastset(&bm) + 1);
- if (!bm_isset(&bm, gid))
- gid += cnf->min_gid;
- else
- gid = (gid_t) (bm_firstunset(&bm) + cnf->min_gid);
- }
-
- /*
- * Another sanity check
- */
- if (gid < cnf->min_gid || gid > cnf->max_gid)
- errx(EX_SOFTWARE, "unable to allocate a new gid - range fully used");
- bm_dealloc(&bm);
}
- return gid;
-}
+ /*
+ * Another sanity check
+ */
+ if (gid < cnf->min_gid || gid > cnf->max_gid)
+ errx(EX_SOFTWARE, "unable to allocate a new gid - range fully used");
+ bm_dealloc(&bm);
+ return (gid);
+}
static int
-print_group(struct group * grp)
+print_group(struct group * grp, bool pretty)
{
- if (!conf.pretty) {
- char *buf = NULL;
-
- buf = gr_make(grp);
- printf("%s\n", buf);
- free(buf);
- } else {
- int i;
+ char *buf = NULL;
+ int i;
+ if (pretty) {
printf("Group Name: %-15s #%lu\n"
" Members: ",
grp->gr_name, (long) grp->gr_gid);
@@ -415,6 +242,444 @@ print_group(struct group * grp)
printf("%s%s", i ? "," : "", grp->gr_mem[i]);
}
fputs("\n\n", stdout);
+ return (EXIT_SUCCESS);
+ }
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list