diff options
| author |   Robert Drehmel <robert@FreeBSD.org> | 2004-06-17 10:29:12 +0000 |
|---|---|---|
| committer | Robert Drehmel <robert@FreeBSD.org> | 2004-06-17 10:29:12 +0000 |
| commit | 2baa9d6a4c21ebe8620f6512f672296828844b48 (patch) | |
| tree | fa179ded3927b9cf08bf0a9ca7ca70432c6e1dea /pw | |
| parent | ff5180d7b0dc11a66f2fc9ab0827cd9644aa03a5 (diff) | |
| download | pw-darwin-2baa9d6a4c21ebe8620f6512f672296828844b48.tar.gz pw-darwin-2baa9d6a4c21ebe8620f6512f672296828844b48.tar.zst pw-darwin-2baa9d6a4c21ebe8620f6512f672296828844b48.zip | |
Fix a bug which occurred when the home directory given by the
-d option was equal to the one already saved and which caused
the pw utility to avoid updating values passed by other options
processed before the -d option in the code path.
Spotted by: Richard Caley <rjc@interactive.co.uk>
Diffstat (limited to 'pw')
| -rw-r--r-- | pw/pw_user.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index 149a1ee..f7a6c56 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -537,7 +537,8 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) } if ((arg = getarg(args, 'd')) != NULL) { - edited = strcmp(pwd->pw_dir, arg->val) != 0; + if (strcmp(pwd->pw_dir, arg->val)) + edited = 1; if (stat(pwd->pw_dir = arg->val, &st) == -1) { if (getarg(args, 'm') == NULL && strcmp(pwd->pw_dir, "/nonexistent") != 0) warnx("WARNING: home `%s' does not exist", pwd->pw_dir); |