Re-apply r336625 which was reverted with r336638, now that the underlying

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

diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c
index ea87f715a2b087123b281ee63b117a13ad619b94..4517a743c73ea46592746556991ee539878ede14 100644 (file)
--- a/pw/pw_vpw.c
+++ b/pw/pw_vpw.c
@@ -39,10 +39,13 @@ static const char rcsid[] =
 #include <string.h>
 #include <stdlib.h>
 #include <err.h>
+#include <unistd.h>
 
 #include "pwupd.h"
 
 static FILE * pwd_fp = NULL;
+static int pwd_scanflag;
+static const char *pwd_filename;
 
 void
 vendpwent(void)
@@ -71,7 +74,18 @@ vnextpwent(char const *nam, uid_t uid, int doclose)
        line = NULL;
        linecap = 0;
 
-       if (pwd_fp != NULL || (pwd_fp = fopen(getpwpath(_MASTERPASSWD), "r")) != NULL) {
+       if (pwd_fp == NULL) {
+               if (geteuid() == 0) {
+                       pwd_filename = _MASTERPASSWD;
+                       pwd_scanflag = PWSCAN_MASTER;
+               } else {
+                       pwd_filename = _PASSWD;
+                       pwd_scanflag = 0;
+               }
+               pwd_fp = fopen(getpwpath(pwd_filename), "r");
+       }
+        
+       if (pwd_fp != NULL) {
                while ((linelen = getline(&line, &linecap, pwd_fp)) > 0) {
                        /* Skip comments and empty lines */
                        if (*line == '\n' || *line == '#')
@@ -79,10 +93,10 @@ vnextpwent(char const *nam, uid_t uid, int doclose)
                        /* trim latest \n */
                        if (line[linelen - 1 ] == '\n')
                                line[linelen - 1] = '\0';
-                       pw = pw_scan(line, PWSCAN_MASTER);
+                       pw = pw_scan(line, pwd_scanflag);
                        if (pw == NULL)
                                errx(EXIT_FAILURE, "Invalid user entry in '%s':"
-                                   " '%s'", getpwpath(_MASTERPASSWD), line);
+                                   " '%s'", getpwpath(pwd_filename), line);
                        if (uid != (uid_t)-1) {
                                if (uid == pw->pw_uid)
                                        break;
@@ -99,6 +113,18 @@ vnextpwent(char const *nam, uid_t uid, int doclose)
        }
        free(line);
 
+       /*
+        * If we read the non-master passwd, some fields may not have been
+        * populated.  Clean them up so that the output looks the same as that
+        * generated using getpwnam() which also inits them to these values.
+        */
+       if (!(pw->pw_fields & _PWF_CLASS))
+               pw->pw_class = "";
+       if (!(pw->pw_fields & _PWF_CHANGE))
+               pw->pw_change = 0;
+       if (!(pw->pw_fields & _PWF_EXPIRE))
+               pw->pw_expire = 0;
+
        return (pw);
 }