Do not expose password if it is empty and PWF_STANDARD format is requested

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

diff --git a/pw/pwupd.c b/pw/pwupd.c
index 8e5fb324a61ddeadd4a60e6a74c4ad094364a719..84226a90b300b73df246057583e899f485edb68f 100644 (file)
--- a/pw/pwupd.c
+++ b/pw/pwupd.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: pwupd.c,v 1.7 1998/02/11 23:31:24 wosch Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -43,6 +43,7 @@ static const char rcsid[] =
 #include "pwupd.h"
 
 #define HAVE_PWDB_C    1
+#define        HAVE_PWDB_U     1
 
 static char pathpwd[] = _PATH_PWD;
 static char * pwpath = pathpwd;
@@ -92,14 +93,14 @@ pwdb(char *arg,...)
        args[i] = NULL;
 
        if ((pid = fork()) == -1)       /* Error (errno set) */
-               i = -1;
+               i = errno;
        else if (pid == 0) {    /* Child */
                execv(args[0], args);
                _exit(1);
        } else {                /* Parent */
                waitpid(pid, &i, 0);
-               if ((i = WEXITSTATUS(i)) != 0)
-                       errno = EIO;    /* set SOMETHING */
+               if (WEXITSTATUS(i))
+                       i = EIO;
        }
        return i;
 }
@@ -110,7 +111,8 @@ fmtpwentry(char *buf, struct passwd * pwd, int type)
        int             l;
        char           *pw;
 
-       pw = (pwd->pw_passwd == NULL || !*pwd->pw_passwd) ? "" : (type == PWF_MASTER) ? pwd->pw_passwd : "*";
+       pw = (type == PWF_MASTER) ?
+           ((pwd->pw_passwd == NULL) ? "" : pwd->pw_passwd) : "*";
 
        if (type == PWF_PASSWD)
                l = sprintf(buf, "%s:*:%ld:%ld:%s:%s:%s\n",
@@ -150,9 +152,12 @@ pw_update(struct passwd * pwd, char const * user, int mode)
 #else
        {                               /* No -C */
 #endif
-               char            pfx[32];
+               char            pfx[PWBUFSZ];
                char            pwbuf[PWBUFSZ];
-               int             l = sprintf(pfx, "%s:", user);
+               int             l = snprintf(pfx, PWBUFSZ, "%s:", user);
+#ifdef HAVE_PWDB_U
+               int             isrename = pwd!=NULL && strcmp(user, pwd->pw_name);
+#endif
 
                /*
                 * Update the passwd file first
@@ -161,15 +166,28 @@ pw_update(struct passwd * pwd, char const * user, int mode)
                        *pwbuf = '\0';
                else
                        fmtpwentry(pwbuf, pwd, PWF_PASSWD);
-               if ((rc = fileupdate(getpwpath(_PASSWD), 0644, pwbuf, pfx, l, mode)) != 0) {
+
+               if (l < 0)
+                       l = 0;
+               rc = fileupdate(getpwpath(_PASSWD), 0644, pwbuf, pfx, l, mode);
+               if (rc == 0) {
 
                        /*
                         * Then the master.passwd file
                         */
                        if (pwd != NULL)
                                fmtpwentry(pwbuf, pwd, PWF_MASTER);
-                       if ((rc = fileupdate(getpwpath(_MASTERPASSWD), 0644, pwbuf, pfx, l, mode)) != 0)
-                               rc = pwdb(NULL) == 0;
+                       rc = fileupdate(getpwpath(_MASTERPASSWD), 0600, pwbuf, pfx, l, mode);
+                       if (rc == 0) {
+#ifdef HAVE_PWDB_U
+                               if (mode == UPD_DELETE || isrename)
+#endif
+                                       rc = pwdb(NULL);
+#ifdef HAVE_PWDB_U
+                               else
+                                       rc = pwdb("-u", user, NULL);
+#endif
+                       }
                }
        }
        return rc;