Remove a death threat from the FreeBSD sources

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

diff --git a/pw/pwupd.c b/pw/pwupd.c
index 51d732ee3cc6f2f65dd1a201c571ef498472bb69..87c3c994bada86698e0fd233f964143866ca99a4 100644 (file)
--- a/pw/pwupd.c
+++ b/pw/pwupd.c
@@ -29,65 +29,42 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <pwd.h>
+#include <libutil.h>
 #include <stdio.h>
 #include <stdlib.h>
 #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>
-#include <sys/wait.h>
 
 #include "pwupd.h"
 
-static char pathpwd[] = _PATH_PWD;
-static char * pwpath = pathpwd;
- 
-int
-setpwdir(const char * dir)
-{
-       if (dir == NULL)
-               return (-1);
-       else
-               pwpath = strdup(dir);
-       if (pwpath == NULL)
-               return (-1);
-
-       return (0);
-}
-
 char *
 getpwpath(char const * file)
 {
        static char pathbuf[MAXPATHLEN];
 
-       snprintf(pathbuf, sizeof pathbuf, "%s/%s", pwpath, file);
+       snprintf(pathbuf, sizeof pathbuf, "%s/%s", conf.etcpath, file);
 
        return (pathbuf);
 }
 
 static int
-pwdb(char *arg,...)
+pwdb_check(void)
 {
        int             i = 0;
        pid_t           pid;
-       va_list         ap;
        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++] = pwpath;
+               args[i++] = conf.etcpath;
        }
        args[i++] = getpwpath(_MASTERPASSWD);
        args[i] = NULL;
@@ -102,7 +79,6 @@ pwdb(char *arg,...)
                if (WEXITSTATUS(i))
                        i = EIO;
        }
-       va_end(ap);
 
        return (i);
 }
@@ -114,7 +90,7 @@ pw_update(struct passwd * pwd, char const * user)
        struct passwd   *old_pw = NULL;
        int              rc, pfd, tfd;
 
-       if ((rc = pwdb("-C", NULL)) != 0)
+       if ((rc = pwdb_check()) != 0)
                return (rc);
 
        if (pwd != NULL)
@@ -123,7 +99,7 @@ pw_update(struct passwd * pwd, char const * user)
        if (user != NULL)
                old_pw = GETPWNAM(user);
 
-       if (pw_init(pwpath, NULL))
+       if (pw_init(conf.etcpath, NULL))
                err(1, "pw_init()");
        if ((pfd = pw_lock()) == -1) {
                pw_fini();
@@ -135,8 +111,11 @@ pw_update(struct passwd * pwd, char const * user)
        }
        if (pw_copy(pfd, tfd, pw, old_pw) == -1) {
                pw_fini();
+               close(tfd);
                err(1, "pw_copy()");
        }
+       fsync(tfd);
+       close(tfd);
        /*
         * in case of deletion of a user, the whole database
         * needs to be regenerated
@@ -168,9 +147,6 @@ chgpwent(char const * login, struct passwd * pwd)
 int
 delpwent(struct passwd * pwd)
 {
-       char login[MAXLOGNAME];
-       
-       strlcpy(login, pwd->pw_name, MAXLOGNAME);
 
-       return (pw_update(NULL, login));
+       return (pw_update(NULL, pwd->pw_name));
 }