diff options
| author |   Baptiste Daroussin <bapt@FreeBSD.org> | 2012-06-19 11:39:56 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-06-19 11:39:56 +0000 |
| commit | 52adf840715f4dc95fddb837b3552d636e42dc0d (patch) | |
| tree | 1fc8e85072f2eebadc1d8fe2bc39144c75e1056c /libutil | |
| parent | 09763af6e8a7d24265c88fa1e7995602e036afe8 (diff) | |
| download | pw-darwin-52adf840715f4dc95fddb837b3552d636e42dc0d.tar.gz pw-darwin-52adf840715f4dc95fddb837b3552d636e42dc0d.tar.zst pw-darwin-52adf840715f4dc95fddb837b3552d636e42dc0d.zip | |
Revert user comparison back to user names as some user can share uids (root/toor
for example)
get the username information from old_pw structures to still allow renaming of a
user.
Reported by: Claude Buisson <clbuisson@orange.fr>
Approved by: des (mentor)
MFC after: 3 weeks
Diffstat (limited to 'libutil')
| -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); |