if the check of the pw db fails return the failed value

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

diff --git a/pw/pwupd.c b/pw/pwupd.c
index 7b960350928888309b62af972997b345247952b6..51d732ee3cc6f2f65dd1a201c571ef498472bb69 100644 (file)
--- a/pw/pwupd.c
+++ b/pw/pwupd.c
@@ -34,7 +34,10 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
+#include <pwd.h>
+#include <libutil.h>
 #include <errno.h>
+#include <err.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -42,8 +45,6 @@ static const char rcsid[] =
 
 #include "pwupd.h"
 
-#define HAVE_PWDB_C    1
-
 static char pathpwd[] = _PATH_PWD;
 static char * pwpath = pathpwd;
  
@@ -51,14 +52,13 @@ 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;
+               return (-1);
+       else
+               pwpath = strdup(dir);
+       if (pwpath == NULL)
+               return (-1);
+
+       return (0);
 }
 
 char *
@@ -67,10 +67,11 @@ getpwpath(char const * file)
        static char pathbuf[MAXPATHLEN];
 
        snprintf(pathbuf, sizeof pathbuf, "%s/%s", pwpath, file);
-       return pathbuf;
+
+       return (pathbuf);
 }
 
-int
+static int
 pwdb(char *arg,...)
 {
        int             i = 0;
@@ -101,101 +102,75 @@ pwdb(char *arg,...)
                if (WEXITSTATUS(i))
                        i = EIO;
        }
-       return i;
-}
-
-int
-fmtpwentry(char *buf, struct passwd * pwd, int type)
-{
-       int             l;
-       char           *pw;
+       va_end(ap);
 
-       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
-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;
 
-       ENDPWENT();
+       if ((rc = pwdb("-C", NULL)) != 0)
+               return (rc);
 
+       if (pwd != NULL)
+               pw = pw_dup(pwd);
+
+       if (user != NULL)
+               old_pw = GETPWNAM(user);
+
+       if (pw_init(pwpath, 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[32];
-               char            pwbuf[PWBUFSZ];
-               int             l = sprintf(pfx, "%s:", user);
-
-               /*
-                * Update the passwd file first
-                */
-               if (pwd == NULL)
-                       *pwbuf = '\0';
-               else
-                       fmtpwentry(pwbuf, pwd, PWF_PASSWD);
-
-               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), 0644, pwbuf, pfx, l, mode);
-                       if (rc == 0) {
-                               if (mode == UPD_DELETE)
-                                       rc = pwdb(NULL);
-                               else
-                                       rc = pwdb("-u", pwd->pw_name, NULL);
-                       }
-               }
+       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)
 {
-       return pw_update(pwd, pwd->pw_name, UPD_CREATE);
+
+       return (pw_update(pwd, NULL));
 }
 
 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)
 {
-       return pw_update(NULL, pwd->pw_name, UPD_DELETE);
+       char login[MAXLOGNAME];
+       
+       strlcpy(login, pwd->pw_name, MAXLOGNAME);
+
+       return (pw_update(NULL, login));
 }