Fix regression: report if a group already exists when creating it

[pw-darwin.git] / chpass / chpass.c

diff --git a/chpass/chpass.c b/chpass/chpass.c
index 2bfdd101938b457419ff609d6828f5cdcec56f21..9f9be5335a682376d0d8063669fbae7f20d45670 100644 (file)
--- a/chpass/chpass.c
+++ b/chpass/chpass.c
@@ -1,6 +1,13 @@
 /*-
  * Copyright (c) 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
 /*-
  * Copyright (c) 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.

+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * Portions of this software were developed for the FreeBSD Project by
+ * ThinkSec AS and NAI Labs, the Security Research Division of Network
+ * Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -31,72 +38,65 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#if 0

 #ifndef lint
 #ifndef lint

-static char copyright[] =
+static const char copyright[] =

 "@(#) Copyright (c) 1988, 1993, 1994\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
 "@(#) Copyright (c) 1988, 1993, 1994\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "From: @(#)chpass.c     8.4 (Berkeley) 4/2/94";
-static char rcsid[] =
-       "$Id: chpass.c,v 1.5 1995/09/02 03:56:17 wpaul Exp $";
+static char sccsid[] = "@(#)chpass.c   8.4 (Berkeley) 4/2/94";

 #endif /* not lint */
 #endif /* not lint */

+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <sys/stat.h>
-#include <sys/signal.h>
-#include <sys/time.h>
-#include <sys/resource.h>

 
 

-#include <ctype.h>

 #include <err.h>
 #include <errno.h>
 #include <err.h>
 #include <errno.h>

-#include <fcntl.h>

 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-
-#include <pw_scan.h>
-#include <pw_util.h>
-#include "pw_copy.h"

 #ifdef YP
 #ifdef YP

-#include "pw_yp.h"
+#include <ypclnt.h>

 #endif
 
 #endif
 

+#include <pw_scan.h>
+#include <libutil.h>
+

 #include "chpass.h"
 #include "chpass.h"

-#include "pathnames.h"

 
 

-char *progname = "chpass";
-char *tempname;
-uid_t uid;
+int master_mode;

 
 

-void   baduser __P((void));
-void   usage __P((void));
+static void    baduser(void);
+static void    usage(void);

 
 int
 
 int

-main(argc, argv)
-       int argc;
-       char **argv;
+main(int argc, char *argv[])

 {
 {

-       enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW } op;
-       struct passwd *pw, lpw;
+       enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW, NEWEXP } op;
+       struct passwd lpw, *old_pw, *pw;

        int ch, pfd, tfd;
        int ch, pfd, tfd;

-       char *arg;
+       const char *password;
+       char *arg = NULL;
+       uid_t uid;

 #ifdef YP
 #ifdef YP

-       int force_local = 0;
-       int force_yp = 0;
+       struct ypclnt *ypclnt;
+       const char *yp_domain = NULL, *yp_host = NULL;

 #endif
 
 #endif
 

+       pw = old_pw = NULL;

        op = EDITENTRY;
 #ifdef YP
        op = EDITENTRY;
 #ifdef YP

-       while ((ch = getopt(argc, argv, "a:p:s:ly")) != EOF)
+       while ((ch = getopt(argc, argv, "a:p:s:e:d:h:loy")) != -1)

 #else
 #else

-       while ((ch = getopt(argc, argv, "a:p:s:")) != EOF)
+       while ((ch = getopt(argc, argv, "a:p:s:e:")) != -1)

 #endif
 #endif

-               switch(ch) {
+               switch (ch) {

                case 'a':
                        op = LOADENTRY;
                        arg = optarg;
                case 'a':
                        op = LOADENTRY;
                        arg = optarg;


@@ -109,78 +109,86 @@ main(argc, argv)
                        op = NEWPW;
                        arg = optarg;
                        break;
                        op = NEWPW;
                        arg = optarg;
                        break;

+               case 'e':
+                       op = NEWEXP;
+                       arg = optarg;
+                       break;

 #ifdef YP
 #ifdef YP

-               case 'l':
-                       force_local = 1;
+               case 'd':
+                       yp_domain = optarg;

                        break;
                        break;

+               case 'h':
+                       yp_host = optarg;
+                       break;
+               case 'l':
+               case 'o':

                case 'y':
                case 'y':

-                       force_yp = 1;
+                       /* compatibility */

                        break;
 #endif
                case '?':
                default:
                        usage();
                }
                        break;
 #endif
                case '?':
                default:
                        usage();
                }

+

        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

+       if (argc > 1)
+               usage();
+

        uid = getuid();
 
        uid = getuid();
 

-       if (op == EDITENTRY || op == NEWSH || op == NEWPW)
-               switch(argc) {
-               case 0:
-                       if (!(pw = getpwuid(uid)))
-                               errx(1, "unknown user: uid %u", uid);
-                       break;
-               case 1:
-                       if (!(pw = getpwnam(*argv)))
+       if (op == EDITENTRY || op == NEWSH || op == NEWPW || op == NEWEXP) {
+               if (argc == 0) {
+                       if ((pw = getpwuid(uid)) == NULL)
+                               errx(1, "unknown user: uid %lu",
+                                   (unsigned long)uid);
+               } else {
+                       if ((pw = getpwnam(*argv)) == NULL)

                                errx(1, "unknown user: %s", *argv);
                                errx(1, "unknown user: %s", *argv);

-                       if (uid && uid != pw->pw_uid)
+                       if (uid != 0 && uid != pw->pw_uid)

                                baduser();
                                baduser();

-                       break;
-               default:
-                       usage();

                }
 
                }
 

-#ifdef YP
-       pw->pw_name = strdup(pw->pw_name);
-       _use_yp = use_yp(pw->pw_name);
-       if (_use_yp == USER_YP_ONLY) {
-               if (!force_local) {
-                       _use_yp = 1;
-                       pw = (struct passwd *)&yp_password;
-               } else
-                       errx(1, "unknown local user: %s.", pw->pw_name);
-       } else if (_use_yp == USER_LOCAL_ONLY) {
-               if (!force_yp) {
-                       _use_yp = 0;
-                       pw = (struct passwd *)&local_password;
-               } else
-                       errx(1, "unknown NIS user: %s.", pw->pw_name);
-       } else if (_use_yp == USER_YP_AND_LOCAL) {
-               if (!force_local) {
-                       _use_yp = 1;
-                       pw = (struct passwd *)&yp_password;
-               } else {
-                       _use_yp = 0;
-                       pw = (struct passwd *)&local_password;
-               }
+               /* Make a copy for later verification */
+               if ((pw = pw_dup(pw)) == NULL ||
+                   (old_pw = pw_dup(pw)) == NULL)
+                       err(1, "pw_dup");

        }
        }

-#endif /* YP */
+
+#ifdef YP
+       if (pw != NULL && (pw->pw_fields & _PWF_SOURCE) == _PWF_NIS) {
+               ypclnt = ypclnt_new(yp_domain, "passwd.byname", yp_host);
+               master_mode = (ypclnt != NULL &&
+                   ypclnt_connect(ypclnt) != -1 &&
+                   ypclnt_havepasswdd(ypclnt) == 1);
+               ypclnt_free(ypclnt);
+       } else
+#endif
+       master_mode = (uid == 0);

 
        if (op == NEWSH) {
                /* protect p_shell -- it thinks NULL is /bin/sh */
                if (!arg[0])
                        usage();
 
        if (op == NEWSH) {
                /* protect p_shell -- it thinks NULL is /bin/sh */
                if (!arg[0])
                        usage();

-               if (p_shell(arg, pw, (ENTRY *)NULL))
-                       pw_error((char *)NULL, 0, 1);
+               if (p_shell(arg, pw, (ENTRY *)NULL) == -1)
+                       exit(1);
+       }
+
+       if (op == NEWEXP) {
+               if (uid)        /* only root can change expire */
+                       baduser();
+               if (p_expire(arg, pw, (ENTRY *)NULL) == -1)
+                       exit(1);

        }
 
        if (op == LOADENTRY) {
                if (uid)
                        baduser();
                pw = &lpw;
        }
 
        if (op == LOADENTRY) {
                if (uid)
                        baduser();
                pw = &lpw;

-               if (!pw_scan(arg, pw))
+               old_pw = NULL;
+               if (!__pw_scan(arg, pw, _PWSCAN_WARN|_PWSCAN_MASTER))

                        exit(1);
        }
 
                        exit(1);
        }
 


@@ -188,79 +196,110 @@ main(argc, argv)
                if (uid)
                        baduser();
 
                if (uid)
                        baduser();
 

-               if(strchr(arg, ':')) {
+               if (strchr(arg, ':'))

                        errx(1, "invalid format for password");
                        errx(1, "invalid format for password");

-               }

                pw->pw_passwd = arg;
        }
 
                pw->pw_passwd = arg;
        }
 

-       /*
-        * The temporary file/file descriptor usage is a little tricky here.
-        * 1:   We start off with two fd's, one for the master password
-        *      file (used to lock everything), and one for a temporary file.
-        * 2:   Display() gets an fp for the temporary file, and copies the
-        *      user's information into it.  It then gives the temporary file
-        *      to the user and closes the fp, closing the underlying fd.
-        * 3:   The user edits the temporary file some number of times.
-        * 4:   Verify() gets an fp for the temporary file, and verifies the
-        *      contents.  It can't use an fp derived from the step #2 fd,
-        *      because the user's editor may have created a new instance of
-        *      the file.  Once the file is verified, its contents are stored
-        *      in a password structure.  The verify routine closes the fp,
-        *      closing the underlying fd.
-        * 5:   Delete the temporary file.
-        * 6:   Get a new temporary file/fd.  Pw_copy() gets an fp for it
-        *      file and copies the master password file into it, replacing
-        *      the user record with a new one.  We can't use the first
-        *      temporary file for this because it was owned by the user.
-        *      Pw_copy() closes its fp, flushing the data and closing the
-        *      underlying file descriptor.  We can't close the master
-        *      password fp, or we'd lose the lock.
-        * 7:   Call pw_mkdb() (which renames the temporary file) and exit.
-        *      The exit closes the master passwd fp/fd.
-        */
-       pw_init();
-       pfd = pw_lock();
-       tfd = pw_tmp();
-

        if (op == EDITENTRY) {
        if (op == EDITENTRY) {

-               display(tfd, pw);
-               edit(pw);
-               (void)unlink(tempname);
-               tfd = pw_tmp();
+               /*
+                * We don't really need pw_*() here, but pw_edit() (used
+                * by edit()) is just too useful...
+                */
+               if (pw_init(NULL, NULL))
+                       err(1, "pw_init()");
+               if ((tfd = pw_tmp(-1)) == -1) {
+                       pw_fini();
+                       err(1, "pw_tmp()");
+               }
+               free(pw);
+               pw = edit(pw_tempname(), old_pw);
+               pw_fini();
+               if (pw == NULL)
+                       err(1, "edit()");
+               /* 
+                * pw_equal does not check for crypted passwords, so we
+                * should do it explicitly
+                */
+               if (pw_equal(old_pw, pw) && 
+                   strcmp(old_pw->pw_passwd, pw->pw_passwd) == 0)
+                       errx(0, "user information unchanged");

        }
 
        }
 

-#ifdef YP
-       if (_use_yp) {
-               yp_submit(pw);
-               (void)unlink(tempname);
+       if (old_pw && !master_mode) {
+               password = getpass("Password: ");
+               if (strcmp(crypt(password, old_pw->pw_passwd),
+                   old_pw->pw_passwd) != 0)
+                       baduser();

        } else {
        } else {

-#endif /* YP */
-       pw_copy(pfd, tfd, pw);
+               password = "";
+       }

 
 

-       if (!pw_mkdb())
-               pw_error((char *)NULL, 0, 1);
+       if (old_pw != NULL)
+               pw->pw_fields |= (old_pw->pw_fields & _PWF_SOURCE);
+       switch (pw->pw_fields & _PWF_SOURCE) {

 #ifdef YP
 #ifdef YP

-       }
+       case _PWF_NIS:
+               ypclnt = ypclnt_new(yp_domain, "passwd.byname", yp_host);
+               if (ypclnt == NULL) {
+                       warnx("ypclnt_new failed");
+                       exit(1);
+               }
+               if (ypclnt_connect(ypclnt) == -1 ||
+                   ypclnt_passwd(ypclnt, pw, password) == -1) {
+                       warnx("%s", ypclnt->error);
+                       ypclnt_free(ypclnt);
+                       exit(1);
+               }
+               ypclnt_free(ypclnt);
+               errx(0, "NIS user information updated");

 #endif /* YP */
 #endif /* YP */

-       exit(0);
+       case 0:
+       case _PWF_FILES:
+               if (pw_init(NULL, NULL))
+                       err(1, "pw_init()");
+               if ((pfd = pw_lock()) == -1) {
+                       pw_fini();
+                       err(1, "pw_lock()");
+               }
+               if ((tfd = pw_tmp(-1)) == -1) {
+                       pw_fini();
+                       err(1, "pw_tmp()");
+               }
+               if (pw_copy(pfd, tfd, pw, old_pw) == -1) {
+                       pw_fini();
+                       err(1, "pw_copy");
+               }
+               if (pw_mkdb(pw->pw_name) == -1) {
+                       pw_fini();
+                       err(1, "pw_mkdb()");
+               }
+               pw_fini();
+               errx(0, "user information updated");
+               break;
+       default:
+               errx(1, "unsupported passwd source");
+       }

 }
 
 }
 

-void
-baduser()
+static void
+baduser(void)

 {
 {

+

        errx(1, "%s", strerror(EACCES));
 }
 
        errx(1, "%s", strerror(EACCES));
 }
 

-void
-usage()
+static void
+usage(void)

 {
 
        (void)fprintf(stderr,
 {
 
        (void)fprintf(stderr,

+           "usage: chpass%s %s [user]\n",

 #ifdef YP
 #ifdef YP

-               "usage: chpass [-l] [-y] [-a list] [-p encpass] [-s shell] [user]\n");
+           " [-d domain] [-h host]",

 #else
 #else

-               "usage: chpass [-a list] [-p encpass] [-s shell] [user]\n");
+           "",

 #endif
 #endif

+           "[-a list] [-p encpass] [-s shell] [-e mmm dd yy]");

        exit(1);
 }
        exit(1);
 }