remove emalloc,ecalloc,erealloc,estrdup

[pw-darwin.git] / libutil / pw_util.c

diff --git a/libutil/pw_util.c b/libutil/pw_util.c
index 8a74fc01f8818e538451eda4b58d5cde2fa1b588..ce9eba229afc28937beb2e7b075036ecfb2acaac 100644 (file)
--- a/libutil/pw_util.c
+++ b/libutil/pw_util.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pw_util.c    8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-       "$Id: pw_util.c,v 1.10 1998/10/13 14:52:33 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
@@ -66,6 +66,8 @@ static const char rcsid[] =
 extern char *tempname;
 static pid_t editpid = -1;
 static int lockfd;
+char *mppath = _PATH_PWD;
+char *masterpasswd = _PATH_MASTERPASSWD;
 
 void
 pw_cont(sig)
@@ -115,21 +117,40 @@ pw_lock()
         * that users can't get at the encrypted passwords while editing.
         * Open should allow flock'ing the file; see 4.4BSD.    XXX
         */
-       lockfd = open(_PATH_MASTERPASSWD, O_RDONLY, 0);
-       if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
-               err(1, "%s", _PATH_MASTERPASSWD);
-       if (flock(lockfd, LOCK_EX|LOCK_NB))
-               errx(1, "the password db file is busy");
+       for (;;) {
+               struct stat st;
+
+               lockfd = open(masterpasswd, O_RDONLY, 0);
+               if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
+                       err(1, "%s", masterpasswd);
+               if (flock(lockfd, LOCK_EX|LOCK_NB))
+                       errx(1, "the password db file is busy");
+
+               /*
+                * If the password file was replaced while we were trying to
+                * get the lock, our hardlink count will be 0 and we have to
+                * close and retry.
+                */
+               if (fstat(lockfd, &st) < 0)
+                       errx(1, "fstat() failed");
+               if (st.st_nlink != 0)
+                       break;
+               close(lockfd);
+               lockfd = -1;
+       }
        return (lockfd);
 }
 
 int
 pw_tmp()
 {
-       static char path[MAXPATHLEN] = _PATH_MASTERPASSWD;
+       static char path[MAXPATHLEN];
        int fd;
        char *p;
 
+       strncpy(path, masterpasswd, MAXPATHLEN - 1);
+       path[MAXPATHLEN] = '\0';
+
        if ((p = strrchr(path, '/')))
                ++p;
        else
@@ -152,11 +173,12 @@ char *username;
        if (!(pid = fork())) {
                if(!username) {
                        warnx("rebuilding the database...");
-                       execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", tempname, NULL);
+                       execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", mppath,
+                           tempname, (char *)NULL);
                } else {
                        warnx("updating the database...");
-                       execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-u", 
-                                       username, tempname, NULL);
+                       execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", mppath,
+                           "-u", username, tempname, (char *)NULL);
                }
                pw_error(_PATH_PWD_MKDB, 1, 1);
        }
@@ -187,7 +209,7 @@ pw_edit(notsetuid)
                        (void)setuid(getuid());
                }
                errno = 0;
-               execlp(editor, p, tempname, NULL);
+               execlp(editor, p, tempname, (char *)NULL);
                _exit(errno);
        }
        for (;;) {
@@ -227,14 +249,18 @@ pw_error(name, err, eval)
 #ifdef YP
        extern int _use_yp;
 #endif /* YP */
-       if (err)
-               warn(name);
+       if (err) {
+               if (name != NULL)
+                       warn("%s", name);
+               else
+                       warn(NULL);
+       }
 #ifdef YP
        if (_use_yp)
                warnx("NIS information unchanged");
        else
 #endif /* YP */
-       warnx("%s: unchanged", _PATH_MASTERPASSWD);
+       warnx("%s: unchanged", masterpasswd);
        (void)unlink(tempname);
        exit(eval);
 }