Recommit everything, add chpass, improve history (except for a few files that git...

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

diff --git a/pw/pwupd.c b/pw/pwupd.c
index 710e901cb0613d63231909976fd33b3233e72879..26160ed27e95effc74405e694f00911e3488eb85 100644 (file)
--- a/pw/pwupd.c
+++ b/pw/pwupd.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *
@@ -29,43 +31,25 @@ 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 <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);
 }
@@ -78,11 +62,11 @@ pwdb_check(void)
        char           *args[10];
 
        args[i++] = _PATH_PWD_MKDB;
-       args[i++] = "-C";
+       args[i++] = "-c";
 
-       if (pwpath != pathpwd) {
+       if (strcmp(conf.etcpath, _PATH_PWD) != 0) {
                args[i++] = "-d";
-               args[i++] = pwpath;
+               args[i++] = conf.etcpath;
        }
        args[i++] = getpwpath(_MASTERPASSWD);
        args[i] = NULL;
@@ -117,7 +101,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();
@@ -129,8 +113,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
@@ -162,9 +149,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));
 }