Remove useless calls to basename().

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

diff --git a/libutil/pw_util.c b/libutil/pw_util.c
index 5eae280e5835c19f1294251a398d0195de23e2b6..2838871d93f6679307814271a79077e2a715c345 100644 (file)
--- a/libutil/pw_util.c
+++ b/libutil/pw_util.c
@@ -58,7 +58,6 @@ static const char rcsid[] =
 #include <err.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <err.h>
 #include <fcntl.h>
 #include <inttypes.h>

-#include <libgen.h>

 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>


@@ -179,11 +178,8 @@ pw_lock(void)
        for (;;) {
                struct stat st;
 
        for (;;) {
                struct stat st;
 

-               lockfd = open(masterpasswd, O_RDONLY, 0);
-               if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
-                       err(1, "%s", masterpasswd);
-               /* XXX vulnerable to race conditions */
-               if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
+               lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK|O_CLOEXEC, 0);
+               if (lockfd == -1) {

                        if (errno == EWOULDBLOCK) {
                                errx(1, "the password db file is busy");
                        } else {
                        if (errno == EWOULDBLOCK) {
                                errx(1, "the password db file is busy");
                        } else {


@@ -229,7 +225,7 @@ pw_tmp(int mfd)
                errno = ENAMETOOLONG;
                return (-1);
        }
                errno = ENAMETOOLONG;
                return (-1);
        }

-       if ((tfd = mkstemp(tempname)) == -1)
+       if ((tfd = mkostemp(tempname, O_SYNC)) == -1)

                return (-1);
        if (mfd != -1) {
                while ((nr = read(mfd, buf, sizeof(buf))) > 0)
                return (-1);
        if (mfd != -1) {
                while ((nr = read(mfd, buf, sizeof(buf))) > 0)


@@ -318,7 +314,7 @@ pw_edit(int notsetuid)
                        (void)setuid(getuid());
                }
                errno = 0;
                        (void)setuid(getuid());
                }
                errno = 0;

-               execlp(editor, basename(editor), tempname, (char *)NULL);
+               execlp(editor, editor, tempname, (char *)NULL);

                _exit(errno);
        default:
                /* parent */
                _exit(errno);
        default:
                /* parent */


@@ -347,7 +343,8 @@ pw_edit(int notsetuid)
        sigprocmask(SIG_SETMASK, &oldsigset, NULL);
        if (stat(tempname, &st2) == -1)
                return (-1);
        sigprocmask(SIG_SETMASK, &oldsigset, NULL);
        if (stat(tempname, &st2) == -1)
                return (-1);

-       return (st1.st_mtime != st2.st_mtime);
+       return (st1.st_mtim.tv_sec != st2.st_mtim.tv_sec ||
+           st1.st_mtim.tv_nsec != st2.st_mtim.tv_nsec);

 }
 
 /*
 }
 
 /*


@@ -406,23 +403,51 @@ pw_make(const struct passwd *pw)
            pw->pw_passwd, (uintmax_t)pw->pw_uid, (uintmax_t)pw->pw_gid,
            pw->pw_class, (uintmax_t)pw->pw_change, (uintmax_t)pw->pw_expire,
            pw->pw_gecos, pw->pw_dir, pw->pw_shell);
            pw->pw_passwd, (uintmax_t)pw->pw_uid, (uintmax_t)pw->pw_gid,
            pw->pw_class, (uintmax_t)pw->pw_change, (uintmax_t)pw->pw_expire,
            pw->pw_gecos, pw->pw_dir, pw->pw_shell);

-       return line;
+       return (line);

 }
 
 /*
 }
 
 /*

- * Copy password file from one descriptor to another, replacing or adding
- * a single record on the way.
+ * Make a passwd line (in v7 format) out of a struct passwd
+ */
+char *
+pw_make_v7(const struct passwd *pw)
+{
+       char *line;
+
+       asprintf(&line, "%s:*:%ju:%ju:%s:%s:%s", pw->pw_name,
+           (uintmax_t)pw->pw_uid, (uintmax_t)pw->pw_gid,
+           pw->pw_gecos, pw->pw_dir, pw->pw_shell);
+       return (line);
+}
+
+/*
+ * Copy password file from one descriptor to another, replacing, deleting
+ * or adding a single record on the way.

  */
 int
 pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
 {
        char buf[8192], *end, *line, *p, *q, *r, t;
        struct passwd *fpw;
  */
 int
 pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
 {
        char buf[8192], *end, *line, *p, *q, *r, t;
        struct passwd *fpw;

+       const struct passwd *spw;

        size_t len;
        int eof, readlen;
 
        size_t len;
        int eof, readlen;
 

-       if ((line = pw_make(pw)) == NULL)
-               return (-1);
+       if (old_pw == NULL && pw == NULL)
+                       return (-1);
+
+       spw = old_pw;
+       /* deleting a user */
+       if (pw == NULL) {
+               line = NULL;
+       } else {
+               if ((line = pw_make(pw)) == NULL)
+                       return (-1);
+       }
+
+       /* adding a user */
+       if (spw == NULL)
+               spw = pw;

 
        eof = 0;
        len = 0;
 
        eof = 0;
        len = 0;


@@ -489,7 +514,7 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
                 */
 
                *q = t;
                 */
 
                *q = t;

-               if (fpw == NULL || strcmp(fpw->pw_name, pw->pw_name) != 0) {
+               if (fpw == NULL || strcmp(fpw->pw_name, spw->pw_name) != 0) {

                        /* nope */
                        if (fpw != NULL)
                                free(fpw);
                        /* nope */
                        if (fpw != NULL)
                                free(fpw);


@@ -506,11 +531,15 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
                }
                free(fpw);
 
                }
                free(fpw);
 

-               /* it is, replace it */
-               len = strlen(line);
-               if (write(tfd, line, len) != (int)len)
-                       goto err;
-
+               /* it is, replace or remove it */
+               if (line != NULL) {
+                       len = strlen(line);
+                       if (write(tfd, line, len) != (int)len)
+                               goto err;
+               } else {
+                       /* when removed, avoid the \n */
+                       q++;
+               }

                /* we're done, just copy the rest over */
                for (;;) {
                        if (write(tfd, q, end - q) != end - q)
                /* we're done, just copy the rest over */
                for (;;) {
                        if (write(tfd, q, end - q) != end - q)


@@ -528,16 +557,22 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
                goto done;
        }
 
                goto done;
        }
 

-       /* if we got here, we have a new entry */
+       /* if we got here, we didn't find the old entry */
+       if (line == NULL) {
+               errno = ENOENT;
+               goto err;
+       }

        len = strlen(line);
        if ((size_t)write(tfd, line, len) != len ||
            write(tfd, "\n", 1) != 1)
                goto err;
  done:
        len = strlen(line);
        if ((size_t)write(tfd, line, len) != len ||
            write(tfd, "\n", 1) != 1)
                goto err;
  done:

-       free(line);
+       if (line != NULL)
+               free(line);

        return (0);
  err:
        return (0);
  err:

-       free(line);
+       if (line != NULL)
+               free(line);

        return (-1);
 }
 
        return (-1);
 }