X-Git-Url: https://git.cameronkatri.com/pw-darwin.git/blobdiff_plain/b1da672b1218212f3151eff39f55f65f6f1bbac0..37f903568b33e005010ceea4921219edbe23ba39:/pw/pw.c diff --git a/pw/pw.c b/pw/pw.c index 96baab4..700a7b2 100644 --- a/pw/pw.c +++ b/pw/pw.c @@ -22,92 +22,163 @@ * 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. - * - * $Id: pw.c,v 1.1.1.2 1996/12/09 23:55:20 joerg Exp $ */ -#include "pw.h" +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif /* not lint */ + +#include +#include +#include +#include +#include +#include -static char *progname = "pw"; +#include "pw.h" -const char *Modes[] = {"add", "del", "mod", "show", "next", NULL}; +const char *Modes[] = { + "add", "del", "mod", "show", "next", + NULL}; const char *Which[] = {"user", "group", NULL}; static const char *Combo1[] = { "useradd", "userdel", "usermod", "usershow", "usernext", + "lock", "unlock", "groupadd", "groupdel", "groupmod", "groupshow", "groupnext", NULL}; static const char *Combo2[] = { "adduser", "deluser", "moduser", "showuser", "nextuser", + "lock", "unlock", "addgroup", "delgroup", "modgroup", "showgroup", "nextgroup", -NULL}; + NULL}; -static struct cargs arglist; +struct pwf PWF = +{ + PWF_REGULAR, + setpwent, + endpwent, + getpwent, + getpwuid, + getpwnam, + setgrent, + endgrent, + getgrent, + getgrgid, + getgrnam, + +}; +struct pwf VPWF = +{ + PWF_ALT, + vsetpwent, + vendpwent, + vgetpwent, + vgetpwuid, + vgetpwnam, + vsetgrent, + vendgrent, + vgetgrent, + vgetgrgid, + vgetgrnam, +}; + +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; - struct userconf *cnf; + int mode = -1, which = -1, tmp; + struct stat st; + char arg, *arg1; + bool relocated, nis; - 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:NP", - "C:qn:u:r", - "C:qn:u:c:d:e:p:g:G:mk:s:w:L:h:FNP", - "C:qn:u:FPa", - "C:q" - }, - { /* grp */ - "C:qn:g:h:M:pNP", - "C:qn:g:", - "C:qn:g:l:h:FM:m:NP", - "C:qn:g:FPa", - "C:q" - } - }; + arg1 = NULL; + relocated = nis = false; + memset(&conf, 0, sizeof(conf)); + strlcpy(conf.rootdir, "/", sizeof(conf.rootdir)); + strlcpy(conf.etcpath, _PATH_PWD, sizeof(conf.etcpath)); + conf.fd = -1; + conf.checkduplicate = true; - static int (*funcs[W_NUM]) (struct userconf * _cnf, int _mode, struct cargs * _args) = - { /* Request handlers */ - pw_user, - pw_group - }; - - umask(0); /* We wish to handle this manually */ - progname = strrchr(argv[0], '/'); - if (progname != NULL) - ++progname; - else - progname = argv[0]; - - LIST_INIT(&arglist); + setlocale(LC_ALL, ""); /* * Break off the first couple of words to determine what exactly * we're being asked to do */ - while (argc > 1 && *argv[1] != '-') { - int tmp; - - if ((tmp = getindex(Modes, argv[1])) != -1) + while (argc > 1) { + if (*argv[1] == '-') { + /* + * Special case, allow pw -V [args] for scripts etc. + */ + arg = argv[1][1]; + if (arg == 'V' || arg == 'R') { + if (relocated) + errx(EXIT_FAILURE, "Both '-R' and '-V' " + "specified, only one accepted"); + relocated = true; + optarg = &argv[1][2]; + if (*optarg == '\0') { + if (stat(argv[2], &st) != 0) + errx(EX_OSFILE, \ + "no such directory `%s'", + argv[2]); + if (!S_ISDIR(st.st_mode)) + errx(EX_OSFILE, "`%s' not a " + "directory", argv[2]); + optarg = argv[2]; + ++argv; + --argc; + } + memcpy(&PWF, &VPWF, sizeof PWF); + if (arg == 'R') { + strlcpy(conf.rootdir, optarg, + sizeof(conf.rootdir)); + PWF._altdir = PWF_ROOTDIR; + } + snprintf(conf.etcpath, sizeof(conf.etcpath), + "%s%s", optarg, arg == 'R' ? "/etc" : ""); + } else + break; + } + else if (mode == -1 && (tmp = getindex(Modes, argv[1])) != -1) mode = tmp; - else if ((tmp = getindex(Which, argv[1])) != -1) + else if (which == -1 && (tmp = getindex(Which, argv[1])) != -1) which = tmp; - else if ((tmp = getindex(Combo1, argv[1])) != -1 || (tmp = getindex(Combo2, argv[1])) != -1) { + else if ((mode == -1 && which == -1) && + ((tmp = getindex(Combo1, argv[1])) != -1 || + (tmp = getindex(Combo2, argv[1])) != -1)) { which = tmp / M_NUM; mode = tmp % M_NUM; - } else if (strcmp(argv[1], "help") == 0) + } else if (strcmp(argv[1], "help") == 0 && argv[2] == NULL) cmdhelp(mode, which); - else if (which != -1 && mode != -1 && arglist.lh_first == NULL) - addarg(&arglist, 'n', argv[1]); + else if (which != -1 && mode != -1) + arg1 = argv[1]; else - cmderr(EX_USAGE, "Unknown keyword `%s'\n", argv[1]); + errx(EX_USAGE, "unknown keyword `%s'", argv[1]); ++argv; --argc; } @@ -118,52 +189,25 @@ main(int argc, char *argv[]) if (mode == -1 || which == -1) cmdhelp(mode, 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. - */ - argv[0] = progname; /* Preserve this */ - optarg = NULL; - - while ((ch = getopt(argc, argv, opts[which][mode])) != -1) { - if (ch == '?') - 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); + conf.rootfd = open(conf.rootdir, O_DIRECTORY|O_CLOEXEC); + if (conf.rootfd == -1) + errx(EXIT_FAILURE, "Unable to open '%s'", conf.rootdir); - /* - * Now, let's do the common initialisation - */ - cnf = read_userconfig(getarg(&arglist, 'C') ? getarg(&arglist, 'C')->val : NULL); - return funcs[which] (cnf, mode, &arglist); + 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); } @@ -172,34 +216,13 @@ getindex(const char *words[], const char *word) * the complexity of the command line. */ -static void -banner(void) -{ - fprintf(stderr, "%s: ", progname); -} - -void -cmderr(int ec, char const * fmt,...) -{ - if (fmt != NULL) { - va_list argp; - - banner(); - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); - } - exit(ec); -} - static void cmdhelp(int mode, int which) { - banner(); if (which == -1) - fprintf(stderr, "usage: %s [user|group] [add|del|mod|show|next] [ help | switches/values ]\n", progname); + fprintf(stderr, "usage:\n pw [user|group|lock|unlock] [add|del|mod|show|next] [help|switches/values]\n"); else if (mode == -1) - fprintf(stderr, "usage: %s %s [add|del|mod|show|next] [ help | switches/values ]\n", progname, Which[which]); + fprintf(stderr, "usage:\n pw %s [add|del|mod|show|next] [help|switches/values]\n", Which[which]); else { /* @@ -208,7 +231,9 @@ cmdhelp(int mode, int which) static const char *help[W_NUM][M_NUM] = { { - "usage: %s useradd [name] [switches]\n" + "usage: pw useradd [name] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-C config configuration file\n" "\t-q quiet operation\n" " Adding users:\n" @@ -221,12 +246,17 @@ cmdhelp(int mode, int which) "\t-g grp initial group\n" "\t-G grp1,grp2 additional groups\n" "\t-m [ -k dir ] create and set up home\n" + "\t-M mode home directory permissions\n" "\t-s shell name of login shell\n" "\t-o duplicate uid ok\n" "\t-L class user class\n" "\t-h fd read password on fd\n" + "\t-H fd read encrypted password on fd\n" + "\t-Y update NIS maps\n" "\t-N no update\n" " Setting defaults:\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-D set user defaults\n" "\t-b dir default home root dir\n" "\t-e period default expiry period\n" @@ -235,15 +265,23 @@ cmdhelp(int mode, int which) "\t-G grp1,grp2 additional groups\n" "\t-L class default user class\n" "\t-k dir default home skeleton\n" + "\t-M mode home directory permissions\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", - "usage: %s userdel [uid|name] [switches]\n" + "\t-s shell default shell\n" + "\t-y path set NIS passwd file path\n", + "usage: pw userdel [uid|name] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\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: %s usermod [uid|name] [switches]\n" + "usage: pw usermod [uid|name] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-C config configuration file\n" "\t-q quiet operation\n" "\t-F force add if no user\n" @@ -258,32 +296,58 @@ cmdhelp(int mode, int which) "\t-l name new login name\n" "\t-L class user class\n" "\t-m [ -k dir ] create and set up home\n" + "\t-M mode home directory permissions\n" "\t-s shell name of login shell\n" "\t-w method set new password using method\n" "\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: %s usershow [uid|name] [switches]\n" + "usage: pw usershow [uid|name] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\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", - "usage: %s usernext [switches]\n" + "\t-a print all users\n" + "\t-7 print in v7 format\n", + "usage: pw usernext [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" + "\t-C config configuration file\n" + "\t-q quiet operation\n", + "usage pw: lock [switches]\n" + "\t-V etcdir alternate /etc locations\n" "\t-C config configuration file\n" + "\t-q quiet operation\n", + "usage pw: unlock [switches]\n" + "\t-V etcdir alternate /etc locations\n" + "\t-C config configuration file\n" + "\t-q quiet operation\n" }, { - "usage: %s groupadd [group|gid] [switches]\n" + "usage: pw groupadd [group|gid] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-C config configuration file\n" "\t-q quiet operation\n" "\t-n group group name\n" "\t-g gid group id\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" + "usage: pw groupdel [group|gid] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-n name group name\n" - "\t-g gid group id\n", - "usage: %s groupmod [group|gid] [switches]\n" + "\t-g gid group id\n" + "\t-Y update NIS maps\n", + "usage: pw groupmod [group|gid] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-C config configuration file\n" "\t-q quiet operation\n" "\t-F force add if not exists\n" @@ -291,43 +355,27 @@ cmdhelp(int mode, int which) "\t-g gid group id\n" "\t-M usr1,usr2 replaces users as group members\n" "\t-m usr1,usr2 add users as group members\n" + "\t-d usr1,usr2 delete 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" + "usage: pw groupshow [group|gid] [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\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", - "usage: %s groupnext [switches]\n" + "usage: pw groupnext [switches]\n" + "\t-V etcdir alternate /etc location\n" + "\t-R rootdir alternate root directory\n" "\t-C config configuration file\n" + "\t-q quiet operation\n" } }; - fprintf(stderr, help[which][mode], progname); + fprintf(stderr, "%s", help[which][mode]); } exit(EXIT_FAILURE); } - -struct carg * -getarg(struct cargs * _args, int ch) -{ - struct carg *c = _args->lh_first; - - while (c != NULL && c->ch != ch) - c = c->list.le_next; - return c; -} - -struct carg * -addarg(struct cargs * _args, int ch, char *argstr) -{ - struct carg *ca = malloc(sizeof(struct carg)); - - if (ca == NULL) - cmderr(EX_OSERR, "Abort - out of memory\n"); - ca->ch = ch; - ca->val = argstr; - LIST_INSERT_HEAD(_args, ca, list); - return ca; -}