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 473cbb6c0c646619f89384b69b21a8756e1c46fc..4517a743c73ea46592746556991ee539878ede14 100644 (file)
--- a/pw/pw_vpw.c
+++ b/pw/pw_vpw.c
@@ -1,4 +1,6 @@
 /*-
 /*-

+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *

  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *
  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *


@@ -30,14 +32,20 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
   "$FreeBSD$";
 #endif /* not lint */
 

+#include <pwd.h>
+#include <grp.h>
+#include <libutil.h>

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

-#include <sys/param.h>
+#include <err.h>
+#include <unistd.h>

 
 #include "pwupd.h"
 
 static FILE * pwd_fp = NULL;
 
 #include "pwupd.h"
 
 static FILE * pwd_fp = NULL;

+static int pwd_scanflag;
+static const char *pwd_filename;

 
 void
 vendpwent(void)
 
 void
 vendpwent(void)


@@ -55,101 +63,69 @@ vsetpwent(void)
 }
 
 static struct passwd *
 }
 
 static struct passwd *

-vnextpwent(char const * nam, uid_t uid, int doclose)
+vnextpwent(char const *nam, uid_t uid, int doclose)

 {
 {

-       struct passwd * pw = NULL;
-       static char pwtmp[1024];
-
-        strlcpy(pwtmp, getpwpath(_MASTERPASSWD), sizeof(pwtmp));
-
-        if (pwd_fp != NULL || (pwd_fp = fopen(pwtmp, "r")) != NULL) {
-                int done = 0;
-
-                static struct passwd pwd;
-
-                while (!done && fgets(pwtmp, sizeof pwtmp, pwd_fp) != NULL)
-                {
-                        int i, quickout = 0;
-                        char * q;
-                        char * p = strchr(pwtmp, '\n');
-
-                        if (p == NULL) {
-                               while (fgets(pwtmp, sizeof pwtmp, pwd_fp) != NULL && strchr(pwtmp, '\n')==NULL)
-                                       ; /* Skip long lines */
-                               continue;
-                        }
-
-                       /* skip comments & empty lines */
-                       if (*pwtmp =='\n' || *pwtmp == '#')
+       struct passwd *pw;
+       char *line;
+       size_t linecap;
+       ssize_t linelen;
+
+       pw = NULL;
+       line = NULL;
+       linecap = 0;
+
+       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 == '#')

                                continue;
                                continue;

-
-                        i = 0;
-                        q = p = pwtmp;
-                        bzero(&pwd, sizeof pwd);
-                        while (!quickout && (p = strsep(&q, ":\n")) != NULL) {
-                               switch (i++)
-                               {
-                                case 0:   /* username */
-                                       pwd.pw_name = p;
-                                       if (nam) {
-                                               if (strcmp(nam, p) == 0)
-                                                       done = 1;
-                                               else
-                                                       quickout = 1;
-                                       }
-                                       break;
-                                case 1:   /* password */
-                                       pwd.pw_passwd = p;
-                                       break;
-                                case 2:   /* uid */
-                                       pwd.pw_uid = atoi(p);
-                                       if (uid != (uid_t)-1) {
-                                               if (uid == pwd.pw_uid)
-                                                       done = 1;
-                                               else
-                                                       quickout = 1;
-                                       }
-                                       break;
-                                case 3:   /* gid */
-                                       pwd.pw_gid = atoi(p);
-                                       break;
-                                case 4:   /* class */
-                                       if (nam == NULL && uid == (uid_t)-1)
-                                               done = 1;
-                                       pwd.pw_class = p;
-                                       break;
-                                case 5:   /* change */
-                                       pwd.pw_change = (time_t)atol(p);
-                                       break;
-                                case 6:   /* expire */
-                                       pwd.pw_expire = (time_t)atol(p);
-                                       break;
-                                case 7:   /* gecos */
-                                       pwd.pw_gecos = p;
-                                       break;
-                                case 8:   /* directory */
-                                       pwd.pw_dir = p;
-                                       break;
-                                case 9:   /* shell */
-                                       pwd.pw_shell = p;
-                                       break;
-                                }
-                       }
-                }
+                       /* trim latest \n */
+                       if (line[linelen - 1 ] == '\n')
+                               line[linelen - 1] = '\0';
+                       pw = pw_scan(line, pwd_scanflag);
+                       if (pw == NULL)
+                               errx(EXIT_FAILURE, "Invalid user entry in '%s':"
+                                   " '%s'", getpwpath(pwd_filename), line);
+                       if (uid != (uid_t)-1) {
+                               if (uid == pw->pw_uid)
+                                       break;
+                       } else if (nam != NULL) {
+                               if (strcmp(nam, pw->pw_name) == 0)
+                                       break;
+                       } else
+                               break;
+                       free(pw);
+                       pw = NULL;
+               }

                if (doclose)
                        vendpwent();
                if (doclose)
                        vendpwent();

-               if (done && pwd.pw_name) {
-                       pw = &pwd;
-
-                       #define CKNULL(s)   s = s ? s : ""
-                       CKNULL(pwd.pw_passwd);
-                       CKNULL(pwd.pw_class);
-                       CKNULL(pwd.pw_gecos);
-                       CKNULL(pwd.pw_dir);
-                       CKNULL(pwd.pw_shell);
-                }
-        }
-        return pw;
+       }
+       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);

 }
 
 struct passwd *
 }
 
 struct passwd *


@@ -170,13 +146,6 @@ vgetpwnam(const char * nam)
   return vnextpwent(nam, -1, 1);
 }
 
   return vnextpwent(nam, -1, 1);
 }
 

-int vpwdb(char *arg, ...)
-{
-  arg=arg;
-  return 0;
-}
-
-

 
 static FILE * grp_fp = NULL;
 
 
 static FILE * grp_fp = NULL;
 


@@ -189,103 +158,53 @@ vendgrent(void)
        }
 }
 
        }
 }
 

-RET_SETGRENT
+void

 vsetgrent(void)
 {
        vendgrent();
 vsetgrent(void)
 {
        vendgrent();

-#if defined(__FreeBSD__)
-       return 0;
-#endif

 }
 
 static struct group *
 }
 
 static struct group *

-vnextgrent(char const * nam, gid_t gid, int doclose)
+vnextgrent(char const *nam, gid_t gid, int doclose)

 {
 {

-       struct group * gr = NULL;
-
-       static char * grtmp = NULL;
-       static int grlen = 0;
-       static char ** mems = NULL;
-       static int memlen = 0;
+       struct group *gr;
+       char *line;
+       size_t linecap;
+       ssize_t linelen;

 
 

-       extendline(&grtmp, &grlen, MAXPATHLEN);
-       strlcpy(grtmp, getgrpath(_GROUP), MAXPATHLEN);
+       gr = NULL;
+       line = NULL;
+       linecap = 0;

 
 

-       if (grp_fp != NULL || (grp_fp = fopen(grtmp, "r")) != NULL) {
-               int done = 0;
-
-               static struct group grp;
-
-               while (!done && fgets(grtmp, grlen, grp_fp) != NULL)
-               {
-                       int i, quickout = 0;
-                       int mno = 0;
-                       char * q, * p;
-                       char * sep = ":\n";
-
-                       if ((p = strchr(grtmp, '\n')) == NULL) {
-                               int l;
-                               extendline(&grtmp, &grlen, grlen + PWBUFSZ);
-                               l = strlen(grtmp);
-                               if (fgets(grtmp + l, grlen - l, grp_fp) == NULL)
-                                 break;        /* No newline terminator on last line */
-                       }
+       if (grp_fp != NULL || (grp_fp = fopen(getgrpath(_GROUP), "r")) != NULL) {
+               while ((linelen = getline(&line, &linecap, grp_fp)) > 0) {

                        /* Skip comments and empty lines */
                        /* Skip comments and empty lines */

-                       if (*grtmp == '\n' || *grtmp == '#')
+                       if (*line == '\n' || *line == '#')

                                continue;
                                continue;

-                       i = 0;
-                       q = p = grtmp;
-                       bzero(&grp, sizeof grp);
-                       extendarray(&mems, &memlen, 200);
-                       while (!quickout && (p = strsep(&q, sep)) != NULL) {
-                               switch (i++)
-                               {
-                               case 0:   /* groupname */
-                                       grp.gr_name = p;
-                                       if (nam) {
-                                               if (strcmp(nam, p) == 0)
-                                                       done = 1;
-                                               else
-                                                       quickout = 1;
-                                       }
-                                       break;
-                               case 1:   /* password */
-                                       grp.gr_passwd = p;
+                       /* trim latest \n */
+                       if (line[linelen - 1 ] == '\n')
+                               line[linelen - 1] = '\0';
+                       gr = gr_scan(line);
+                       if (gr == NULL)
+                               errx(EXIT_FAILURE, "Invalid group entry in '%s':"
+                                   " '%s'", getgrpath(_GROUP), line);
+                       if (gid != (gid_t)-1) {
+                               if (gid == gr->gr_gid)

                                        break;
                                        break;

-                               case 2:   /* gid */
-                                       grp.gr_gid = atoi(p);
-                                       if (gid != (gid_t)-1) {
-                                               if (gid == (gid_t)grp.gr_gid)
-                                                       done = 1;
-                                               else
-                                                       quickout = 1;
-                                       } else if (nam == NULL)
-                                               done = 1;
+                       } else if (nam != NULL) {
+                               if (strcmp(nam, gr->gr_name) == 0)

                                        break;
                                        break;

-                               case 3:
-                                       q = p;
-                                       sep = ",\n";
-                                       break;
-                               default:
-                                       if (*p) {
-                                               extendarray(&mems, &memlen, mno + 2);
-                                               mems[mno++] = p;
-                                       }
-                                       break;
-                               }
-                       }
-                       grp.gr_mem = mems;
-                       mems[mno] = NULL;
-                }
+                       } else
+                               break;
+                       free(gr);
+                       gr = NULL;
+               }

                if (doclose)
                        vendgrent();
                if (doclose)
                        vendgrent();

-               if (done && grp.gr_name) {
-                       gr = &grp;
-
-                       CKNULL(grp.gr_passwd);
-               }

        }
        }

-       return gr;
+       free(line);
+
+       return (gr);

 }
 
 struct group *
 }
 
 struct group *


@@ -307,10 +226,3 @@ vgetgrnam(const char * nam)
   return vnextgrent(nam, -1, 1);
 }
 
   return vnextgrent(nam, -1, 1);
 }
 

-int
-vgrdb(char *arg, ...)
-{
-  arg=arg;
-  return 0;
-}
-