diff options
| author | Peter Grehan <grehan@FreeBSD.org> | 2012-07-11 19:54:21 +0000 |
|---|---|---|
| committer | Peter Grehan <grehan@FreeBSD.org> | 2012-07-11 19:54:21 +0000 |
| commit | 235c3539045381ef78a5d0d16e4e60e4c2b97a7b (patch) | |
| tree | 1fc8e85072f2eebadc1d8fe2bc39144c75e1056c /libutil/pw_util.c | |
| parent | 08f2d2c14972fd8214be8e62704b0a8714ae15a9 (diff) | |
| parent | 52adf840715f4dc95fddb837b3552d636e42dc0d (diff) | |
| download | pw-darwin-235c3539045381ef78a5d0d16e4e60e4c2b97a7b.tar.gz pw-darwin-235c3539045381ef78a5d0d16e4e60e4c2b97a7b.zip | |
IFC @ r238370
Diffstat (limited to 'libutil/pw_util.c')
| -rw-r--r-- | libutil/pw_util.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libutil/pw_util.c b/libutil/pw_util.c index 63c63de..4bf3001 100644 --- a/libutil/pw_util.c +++ b/libutil/pw_util.c @@ -437,14 +437,21 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw) size_t len; int eof, readlen; - spw = pw; + if (old_pw == NULL && pw == NULL) + return (-1); + + spw = old_pw; + /* deleting a user */ if (pw == NULL) { line = NULL; - if (old_pw == NULL) + } else { + if ((line = pw_make(pw)) == NULL) return (-1); - spw = old_pw; - } else if ((line = pw_make(pw)) == NULL) - return (-1); + } + + /* adding a user */ + if (spw == NULL) + spw = pw; eof = 0; len = 0; @@ -511,7 +518,7 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw) */ *q = t; - if (fpw == NULL || fpw->pw_uid != spw->pw_uid) { + if (fpw == NULL || strcmp(fpw->pw_name, spw->pw_name) != 0) { /* nope */ if (fpw != NULL) free(fpw); |