#ifndef lint
static const char rcsid[] =
- "$Id: pw.c,v 1.10 1998/08/04 22:31:26 nate Exp $";
+ "$Id: pw.c,v 1.14 1999/02/23 11:01:50 davidn Exp $";
#endif /* not lint */
-#include "pw.h"
#include <err.h>
#include <fcntl.h>
#include <paths.h>
#include <sys/wait.h>
+#include "pw.h"
const char *Modes[] = {"add", "del", "mod", "show", "next", NULL};
const char *Which[] = {"user", "group", NULL};
"addgroup", "delgroup", "modgroup", "showgroup", "nextgroup",
NULL};
+struct pwf PWF =
+{
+ 0,
+ setpwent,
+ endpwent,
+ getpwent,
+ getpwuid,
+ getpwnam,
+ pwdb,
+ setgrent,
+ endgrent,
+ getgrent,
+ getgrgid,
+ getgrnam,
+ grdb
+
+};
+struct pwf VPWF =
+{
+ 1,
+ vsetpwent,
+ vendpwent,
+ vgetpwent,
+ vgetpwuid,
+ vgetpwnam,
+ vpwdb,
+ vsetgrent,
+ vendgrent,
+ vgetgrent,
+ vgetgrgid,
+ vgetgrnam,
+ vgrdb
+};
+
static struct cargs arglist;
static int getindex(const char *words[], const char *word);
int ch;
int mode = -1;
int which = -1;
+ char *config = NULL;
struct userconf *cnf;
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: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"
+ "V:C:qn:u:c:d:e:p:g:G:mk:s:oL:i:w:h:Db:NPy:Y",
+ "V:C:qn:u:rY",
+ "V:C:qn:u:c:d:e:p:g:G:ml:k:s:w:L:h:FNPY",
+ "V:C:qn:u:FPa7",
+ "V: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"
+ "V:C:qn:g:h:M:pNPY",
+ "V:C:qn:g:Y",
+ "V:C:qn:g:l:h:FM:m:NPY",
+ "V:C:qn:g:FPa",
+ "V:C:q"
}
};
* Break off the first couple of words to determine what exactly
* we're being asked to do
*/
- while (argc > 1 && *argv[1] != '-') {
+ while (argc > 1) {
int tmp;
- if ((tmp = getindex(Modes, argv[1])) != -1)
+ if (*argv[1] == '-') {
+ /*
+ * Special case, allow pw -V<dir> <operation> [args] for scripts etc.
+ */
+ if (argv[1][1] == 'V') {
+ optarg = &argv[1][2];
+ if (*optarg == '\0') {
+ optarg = argv[2];
+ ++argv;
+ --argc;
+ }
+ addarg(&arglist, 'V', optarg);
+ } else
+ break;
+ }
+ else if ((tmp = getindex(Modes, argv[1])) != -1)
mode = tmp;
else if ((tmp = getindex(Which, argv[1])) != -1)
which = tmp;
mode = tmp % M_NUM;
} else if (strcmp(argv[1], "help") == 0)
cmdhelp(mode, which);
- else if (which != -1 && mode != -1 && arglist.lh_first == NULL)
+ else if (which != -1 && mode != -1)
addarg(&arglist, 'n', argv[1]);
else
errx(EX_USAGE, "unknown keyword `%s'", argv[1]);
if (getarg(&arglist, 'q') != NULL)
freopen("/dev/null", "w", stderr);
+ /*
+ * Set our base working path if not overridden
+ */
+
+ config = getarg(&arglist, 'C') ? getarg(&arglist, 'C')->val : NULL;
+
+ if (getarg(&arglist, 'V') != NULL) {
+ char * etcpath = getarg(&arglist, 'V')->val;
+ if (*etcpath) {
+ if (config == NULL) { /* Only override config location if -C not specified */
+ config = malloc(MAXPATHLEN);
+ snprintf(config, MAXPATHLEN, "%s/pw.conf", etcpath);
+ }
+ memcpy(&PWF, &VPWF, sizeof PWF);
+ setpwdir(etcpath);
+ setgrdir(etcpath);
+ }
+ }
+
/*
* Now, let's do the common initialisation
*/
- cnf = read_userconfig(getarg(&arglist, 'C') ? getarg(&arglist, 'C')->val : NULL);
+ cnf = read_userconfig(config);
ch = funcs[which] (cnf, mode, &arglist);
{
{
"usage: pw useradd [name] [switches]\n"
+ "\t-V etcdir alternate /etc location\n"
"\t-C config configuration file\n"
"\t-q quiet operation\n"
" Adding users:\n"
"\t-Y update NIS maps\n"
"\t-N no update\n"
" Setting defaults:\n"
- "\t-D set user defaults\n"
+ "\t-V etcdir alternate /etc location\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"
"\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-n name login name\n"
"\t-u uid user id\n"
"\t-Y update NIS maps\n"
"\t-r remove home & contents\n",
"usage: pw usermod [uid|name] [switches]\n"
+ "\t-V etcdir alternate /etc location\n"
"\t-C config configuration file\n"
"\t-q quiet operation\n"
"\t-F force add if no user\n"
"\t-Y update NIS maps\n"
"\t-N no update\n",
"usage: pw usershow [uid|name] [switches]\n"
+ "\t-V etcdir alternate /etc location\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-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-C config configuration file\n"
},
{
"usage: pw groupadd [group|gid] [switches]\n"
+ "\t-V etcdir alternate /etc location\n"
"\t-C config configuration file\n"
"\t-q quiet operation\n"
"\t-n group group name\n"
"\t-Y update NIS maps\n"
"\t-N no update\n",
"usage: pw groupdel [group|gid] [switches]\n"
+ "\t-V etcdir alternate /etc location\n"
"\t-n name group name\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-C config configuration file\n"
"\t-q quiet operation\n"
"\t-F force add if not exists\n"
"\t-Y update NIS maps\n"
"\t-N no update\n",
"usage: pw groupshow [group|gid] [switches]\n"
+ "\t-V etcdir alternate /etc location\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: pw groupnext [switches]\n"
+ "\t-V etcdir alternate /etc location\n"
"\t-C config configuration file\n"
}
};
git.ckatri.com / pw-darwin.git / blobdiff