* 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 "pw.h"
+#ifndef lint
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif /* not lint */
+
+#include <err.h>
+#include <fcntl.h>
+#include <locale.h>
#include <paths.h>
#include <sys/wait.h>
+#include "pw.h"
-static char *progname = "pw";
-
-const char *Modes[] = {"add", "del", "mod", "show", "next", NULL};
+#if !defined(_PATH_YP)
+#define _PATH_YP "/var/yp/"
+#endif
+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};
+
+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;
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:mM:k:s:oL:i:w:h:H:Db:NPy:Y",
+ "V:C:qn:u:rY",
+ "V:C:qn:u:c:d:e:p:g:G:mM:l:k:s:w:L:h:H:FNPY",
+ "V:C:qn:u:FPa7",
+ "V:C:q",
+ "V:C:q",
+ "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:H:M:opNPY",
+ "V:C:qn:g:Y",
+ "V:C:qn:g:l:h:H:FM:m:NPY",
+ "V:C:qn:g:FPa",
+ "V:C:q"
}
};
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);
+ (void)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] != '-') {
+ 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 (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)
+ else if (which != -1 && mode != -1)
addarg(&arglist, 'n', argv[1]);
else
- cmderr(EX_USAGE, "Unknown keyword `%s'\n", argv[1]);
+ errx(EX_USAGE, "unknown keyword `%s'", argv[1]);
++argv;
--argc;
}
* 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);
+ errx(EX_USAGE, "unknown switch");
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");
+ if (geteuid() != 0 && mode != M_PRINT && mode != M_NEXT && getarg(&arglist, 'N')==NULL)
+ 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 (getarg(&arglist, 'q') != NULL)
- freopen("/dev/null", "w", stderr);
+ freopen(_PATH_DEVNULL, "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);
/*
fflush(NULL);
if (chdir(_PATH_YP) == -1)
- perror("chdir(" _PATH_YP ")");
+ warn("chdir(" _PATH_YP ")");
else if ((pid = fork()) == -1)
- perror("fork()");
+ warn("fork()");
else if (pid == 0) {
/* Is make anywhere else? */
- execlp("/usr/bin/make", "make", NULL);
+ execlp("/usr/bin/make", "make", (char *)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);
+ errx(ch, "make exited with status %d", i);
else
pw_log(cnf, mode, which, "NIS maps updated");
}
return ch;
}
+
static int
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 {
/*
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-C config configuration file\n"
"\t-q quiet operation\n"
" Adding users:\n"
"\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-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-w method set default password method\n"
"\t-s shell default shell\n"
"\t-y path set NIS passwd file path\n",
- "usage: %s userdel [uid|name] [switches]\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: %s usermod [uid|name] [switches]\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-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-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-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-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-C config configuration file\n"
"\t-q quiet operation\n"
"\t-n group group name\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-n name group name\n"
"\t-g gid group id\n"
"\t-Y update NIS maps\n",
- "usage: %s groupmod [group|gid] [switches]\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-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-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-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;
+ struct carg *c = LIST_FIRST(_args);
while (c != NULL && c->ch != ch)
- c = c->list.le_next;
+ c = LIST_NEXT(c, list);
return c;
}
struct carg *ca = malloc(sizeof(struct carg));
if (ca == NULL)
- cmderr(EX_OSERR, "Abort - out of memory\n");
+ errx(EX_OSERR, "out of memory");
ca->ch = ch;
ca->val = argstr;
LIST_INSERT_HEAD(_args, ca, list);
git.ckatri.com / pw-darwin.git / blobdiff