Cast uid/git to uintmax_t when using printf-like functions so the size of

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

diff --git a/pw/pwupd.c b/pw/pwupd.c
index 0483be109dae016581519adff4923a3ef721c6ca..f9e1959f44a7c3d9de10179bdc5505113e4889b7 100644 (file)
--- a/pw/pwupd.c
+++ b/pw/pwupd.c
@@ -33,8 +33,10 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-#include <stdarg.h>
+#include <pwd.h>
+#include <libutil.h>

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

+#include <err.h>

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


@@ -42,52 +44,29 @@ static const char rcsid[] =
 
 #include "pwupd.h"
 
 
 #include "pwupd.h"
 

-#define HAVE_PWDB_C    1
-#define        HAVE_PWDB_U     1
-
-static char pathpwd[] = _PATH_PWD;
-static char * pwpath = pathpwd;
- 
-int
-setpwdir(const char * dir)
-{
-       if (dir == NULL)
-               return -1;
-       else {
-               char * d = malloc(strlen(dir)+1);
-               if (d == NULL)
-                       return -1;
-               pwpath = strcpy(d, dir);
-       }
-       return 0;
-}
-

 char *
 getpwpath(char const * file)
 {
        static char pathbuf[MAXPATHLEN];
 
 char *
 getpwpath(char const * file)
 {
        static char pathbuf[MAXPATHLEN];
 

-       snprintf(pathbuf, sizeof pathbuf, "%s/%s", pwpath, file);
-       return pathbuf;
+       snprintf(pathbuf, sizeof pathbuf, "%s/%s", conf.etcpath, file);
+
+       return (pathbuf);

 }
 
 }
 

-int
-pwdb(char *arg,...)
+static int
+pwdb_check(void)

 {
        int             i = 0;
        pid_t           pid;
 {
        int             i = 0;
        pid_t           pid;

-       va_list         ap;

        char           *args[10];
 
        args[i++] = _PATH_PWD_MKDB;
        char           *args[10];
 
        args[i++] = _PATH_PWD_MKDB;

-       va_start(ap, arg);
-       while (i < 6 && arg != NULL) {
-               args[i++] = arg;
-               arg = va_arg(ap, char *);
-       }
-       if (pwpath != pathpwd) {
+       args[i++] = "-C";
+
+       if (strcmp(conf.etcpath, _PATH_PWD) != 0) {

                args[i++] = "-d";
                args[i++] = "-d";

-               args[i++] = pwpath;
+               args[i++] = conf.etcpath;

        }
        args[i++] = getpwpath(_MASTERPASSWD);
        args[i] = NULL;
        }
        args[i++] = getpwpath(_MASTERPASSWD);
        args[i] = NULL;


@@ -102,110 +81,71 @@ pwdb(char *arg,...)
                if (WEXITSTATUS(i))
                        i = EIO;
        }
                if (WEXITSTATUS(i))
                        i = EIO;
        }

-       return i;
-}
-
-int
-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 : "*";
-
-       if (type == PWF_PASSWD)
-               l = sprintf(buf, "%s:*:%ld:%ld:%s:%s:%s\n",
-                      pwd->pw_name, (long) pwd->pw_uid, (long) pwd->pw_gid,
-                           pwd->pw_gecos ? pwd->pw_gecos : "User &",
-                           pwd->pw_dir, pwd->pw_shell);
-       else
-               l = sprintf(buf, "%s:%s:%ld:%ld:%s:%lu:%lu:%s:%s:%s\n",
-                  pwd->pw_name, pw, (long) pwd->pw_uid, (long) pwd->pw_gid,
-                           pwd->pw_class ? pwd->pw_class : "",
-                           (unsigned long) pwd->pw_change,
-                           (unsigned long) pwd->pw_expire,
-                           pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
-       return l;
-}

 
 

-
-int
-fmtpwent(char *buf, struct passwd * pwd)
-{
-       return fmtpwentry(buf, pwd, PWF_STANDARD);
+       return (i);

 }
 
 static int
 }
 
 static int

-pw_update(struct passwd * pwd, char const * user, int mode)
+pw_update(struct passwd * pwd, char const * user)

 {
 {

-       int             rc = 0;
+       struct passwd   *pw = NULL;
+       struct passwd   *old_pw = NULL;
+       int              rc, pfd, tfd;
+
+       if ((rc = pwdb_check()) != 0)
+               return (rc);
+
+       if (pwd != NULL)
+               pw = pw_dup(pwd);

 
 

-       ENDPWENT();
+       if (user != NULL)
+               old_pw = GETPWNAM(user);

 
 

+       if (pw_init(conf.etcpath, 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()");
+       }

        /*
        /*

-        * First, let's check the see if the database is alright
-        * Note: -C is only available in FreeBSD 2.2 and above
+        * in case of deletion of a user, the whole database
+        * needs to be regenerated

         */
         */

-#ifdef HAVE_PWDB_C
-       if (pwdb("-C", NULL) == 0) {    /* Check only */
-#else
-       {                               /* No -C */
-#endif
-               char            pfx[PWBUFSZ];
-               char            pwbuf[PWBUFSZ];
-               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
-                */
-               if (pwd == NULL)
-                       *pwbuf = '\0';
-               else
-                       fmtpwentry(pwbuf, pwd, PWF_PASSWD);
-
-               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);
-                       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
-                       }
-               }
+       if (pw_mkdb(pw != NULL ? pw->pw_name : NULL) == -1) {
+               pw_fini();
+               err(1, "pw_mkdb()");

        }
        }

-       return rc;
+       free(pw);
+       pw_fini();
+
+       return (0);

 }
 
 int
 addpwent(struct passwd * pwd)
 {
 }
 
 int
 addpwent(struct passwd * pwd)
 {

-       return pw_update(pwd, pwd->pw_name, UPD_CREATE);
+
+       return (pw_update(pwd, NULL));

 }
 
 int
 chgpwent(char const * login, struct passwd * pwd)
 {
 }
 
 int
 chgpwent(char const * login, struct passwd * pwd)
 {

-       return pw_update(pwd, login, UPD_REPLACE);
+
+       return (pw_update(pwd, login));

 }
 
 int
 delpwent(struct passwd * pwd)
 {
 }
 
 int
 delpwent(struct passwd * pwd)
 {

-       return pw_update(NULL, pwd->pw_name, UPD_DELETE);
+
+       return (pw_update(NULL, pwd->pw_name));

 }
 }