/*-
- * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
- * All rights reserved.
+ * Copyright (C) 1996
+ * David L. Nugent. 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 as
- * the first lines of this file unmodified.
+ * notice, this list of conditions and the following disclaimer.
* 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by David L. Nugent.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE DAVID L. NUGENT ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``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 DAVID L. NUGENT BE LIABLE
+ * ARE DISCLAIMED. IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS 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)
*/
#include "pw.h"
+#include <paths.h>
+#include <sys/wait.h>
static char *progname = "pw";
-const char *Modes[] = {"add", "del", "mod", "show", NULL};
+const char *Modes[] = {"add", "del", "mod", "show", "next", NULL};
const char *Which[] = {"user", "group", NULL};
-static const char *Combo1[] = {"useradd", "userdel", "usermod", "usershow",
- "groupadd", "groupdel", "groupmod", "groupshow",
-NULL};
-static const char *Combo2[] = {"adduser", "deluser", "moduser", "showuser",
- "addgroup", "delgroup", "modgroup", "showgroup",
+static const char *Combo1[] = {
+ "useradd", "userdel", "usermod", "usershow", "usernext",
+ "groupadd", "groupdel", "groupmod", "groupshow", "groupnext",
+ NULL};
+static const char *Combo2[] = {
+ "adduser", "deluser", "moduser", "showuser", "nextuser",
+ "addgroup", "delgroup", "modgroup", "showgroup", "nextgroup",
NULL};
static struct cargs arglist;
static const char *opts[W_NUM][M_NUM] =
{
- /* user */ {"C:qn:u:c:d:e:p:g:G:mk:s:oL:i:w:h:Db", "C:qn:u:r", "C:qn:u:c:d:e:p:g:G:mk:s:L:h:F", "C:qn:u:Fpa"},
- /* grp */ {"C:qn:g:h:p", "C:qn:g:", "C:qn:g:l:h:F", "C:qn:g:Fpa"}
+ { /* user */
+ "C:qn:u:c:d:e:p:g:G:mk:s:oL:i:w:h:Db:NPy:Y",
+ "C:qn:u:rY",
+ "C:qn:u:c:d:e:p:g:G:ml:k:s:w:L:h:FNPY",
+ "C:qn:u:FPa",
+ "C:q"
+ },
+ { /* grp */
+ "C:qn:g:h:M:pNPY",
+ "C:qn:g:Y",
+ "C:qn:g:l:h:FM:m:NPY",
+ "C:qn:g:FPa",
+ "C:q"
+ }
};
static int (*funcs[W_NUM]) (struct userconf * _cnf, int _mode, struct cargs * _args) =
else if (which != -1 && mode != -1 && arglist.lh_first == NULL)
addarg(&arglist, 'n', argv[1]);
else
- cmderr(X_CMDERR, "Unknown keyword `%s'\n", argv[1]);
+ cmderr(EX_USAGE, "Unknown keyword `%s'\n", argv[1]);
++argv;
--argc;
}
if (mode == -1 || which == -1)
cmdhelp(mode, which);
- /*
- * Must be root to attempt an update
- */
- if (getuid() != 0 && mode != M_PRINT)
- cmderr(X_PERMERR, "you must be root to run this program\n");
-
/*
* 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.
while ((ch = getopt(argc, argv, opts[which][mode])) != -1) {
if (ch == '?')
- cmderr(X_CMDERR, NULL);
+ cmderr(EX_USAGE, NULL);
else
addarg(&arglist, ch, optarg);
optarg = NULL;
}
+ /*
+ * Must be root to attempt an update
+ */
+ if (getuid() != 0 && mode != M_PRINT && mode != M_NEXT && getarg(&arglist, 'N')==NULL)
+ cmderr(EX_NOPERM, "you must be root to run this program\n");
+
/*
* We should immediately look for the -q 'quiet' switch so that we
* don't bother with extraneous errors
if (getarg(&arglist, 'q') != NULL)
freopen("/dev/null", "w", stderr);
- ch = X_CMDERR;
-
/*
* Now, let's do the common initialisation
*/
cnf = read_userconfig(getarg(&arglist, 'C') ? getarg(&arglist, 'C')->val : NULL);
+ ch = funcs[which] (cnf, mode, &arglist);
- if (funcs[which])
- ch = funcs[which] (cnf, mode, &arglist);
- else
- fprintf(stderr, "%s: %s[%s] not yet implemented.\n", progname, Which[which], Modes[mode]);
-
+ /*
+ * If everything went ok, and we've been asked to update
+ * the NIS maps, then do it now
+ */
+ if (ch == EXIT_SUCCESS && getarg(&arglist, 'Y') != NULL) {
+ pid_t pid;
+
+ fflush(NULL);
+ if (chdir(_PATH_YP) == -1)
+ perror("chdir(" _PATH_YP ")");
+ else if ((pid = fork()) == -1)
+ perror("fork()");
+ else if (pid == 0) {
+ /* Is make anywhere else? */
+ execlp("/usr/bin/make", "make", NULL);
+ _exit(1);
+ } else {
+ int i;
+ waitpid(pid, &i, 0);
+ if ((i = WEXITSTATUS(i)) != 0)
+ cmderr(ch, "warning: make exited with status %d\n", i);
+ else
+ pw_log(cnf, mode, which, "NIS maps updated");
+ }
+ }
return ch;
}
{
banner();
if (which == -1)
- fprintf(stderr, "usage: %s [user|group] [add|del|mod|show] [ help | switches/values ]\n", progname);
+ fprintf(stderr, "usage: %s [user|group] [add|del|mod|show|next] [ help | switches/values ]\n", progname);
else if (mode == -1)
- fprintf(stderr, "usage: %s %s [add|del|mod] [ help | switches/values ]\n", progname, Which[which]);
+ fprintf(stderr, "usage: %s %s [add|del|mod|show|next] [ help | switches/values ]\n", progname, Which[which]);
else {
/*
"\t-o duplicate uid ok\n"
"\t-L class user class\n"
"\t-h fd read password on fd\n"
+ "\t-Y update NIS maps\n"
+ "\t-N no update\n"
" Setting defaults:\n"
"\t-D set user defaults\n"
"\t-b dir default home root dir\n"
"\t-u min,max set min,max uids\n"
"\t-i min,max set min,max gids\n"
"\t-w method set default password method\n"
- "\t-s shell default shell\n",
+ "\t-s shell default shell\n"
+ "\t-y path set NIS passwd file path\n",
"usage: %s userdel [uid|name] [switches]\n"
"\t-n name login name\n"
"\t-u uid user id\n"
+ "\t-Y update NIS maps\n"
"\t-r remove home & contents\n",
"usage: %s usermod [uid|name] [switches]\n"
"\t-C config configuration file\n"
"\t-L class user class\n"
"\t-m [ -k dir ] create and set up home\n"
"\t-s shell name of login shell\n"
- "\t-h fd read password on fd\n",
+ "\t-w method set new password using method\n"
+ "\t-h fd read password on fd\n"
+ "\t-Y update NIS maps\n"
+ "\t-N no update\n",
"usage: %s usershow [uid|name] [switches]\n"
"\t-n name login name\n"
"\t-u uid user id\n"
"\t-F force print\n"
- "\t-p prettier format\n"
- "\t-a print all users\n"
+ "\t-P prettier format\n"
+ "\t-a print all users\n",
+ "usage: %s usernext [switches]\n"
+ "\t-C config configuration file\n"
},
{
"usage: %s groupadd [group|gid] [switches]\n"
"\t-q quiet operation\n"
"\t-n group group name\n"
"\t-g gid group id\n"
- "\t-o duplicate gid ok\n",
+ "\t-M usr1,usr2 add users as group members\n"
+ "\t-o duplicate gid ok\n"
+ "\t-Y update NIS maps\n"
+ "\t-N no update\n",
"usage: %s groupdel [group|gid] [switches]\n"
"\t-n name group name\n"
- "\t-g gid group id\n",
+ "\t-g gid group id\n"
+ "\t-Y update NIS maps\n",
"usage: %s groupmod [group|gid] [switches]\n"
"\t-C config configuration file\n"
"\t-q quiet operation\n"
"\t-F force add if not exists\n"
"\t-n name group name\n"
"\t-g gid group id\n"
- "\t-l name new group name\n",
+ "\t-M usr1,usr2 replaces users as group members\n"
+ "\t-m usr1,usr2 add users as group members\n"
+ "\t-l name new group name\n"
+ "\t-Y update NIS maps\n"
+ "\t-N no update\n",
"usage: %s groupshow [group|gid] [switches]\n"
"\t-n name group name\n"
"\t-g gid group id\n"
"\t-F force print\n"
- "\t-p prettier format\n"
- "\t-a print all accounting groups\n"
+ "\t-P prettier format\n"
+ "\t-a print all accounting groups\n",
+ "usage: %s groupnext [switches]\n"
+ "\t-C config configuration file\n"
}
};
fprintf(stderr, help[which][mode], progname);
}
- exit(X_CMDERR);
+ exit(EXIT_FAILURE);
}
struct carg *
struct carg *ca = malloc(sizeof(struct carg));
if (ca == NULL)
- cmderr(X_MEMERR, "Abort - out of memory\n");
+ cmderr(EX_OSERR, "Abort - out of memory\n");
ca->ch = ch;
ca->val = argstr;
LIST_INSERT_HEAD(_args, ca, list);
git.ckatri.com / pw-darwin.git / blobdiff