diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-06-04 08:00:11 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-06-04 08:00:11 +0000 |
| commit | c24c3080ea460dd30a0f486a4a4dd9c73339204a (patch) | |
| tree | 8a4d0e5aaa9028e262f19edcb4dd4844bb8f7b2a /lib/libutil/pw_util.c | |
| parent | b8d083798ced0b8720d24c78a6124ff6bbaea044 (diff) | |
| download | src-c24c3080ea460dd30a0f486a4a4dd9c73339204a.tar.gz src-c24c3080ea460dd30a0f486a4a4dd9c73339204a.zip | |
revert r283969,283970 not needed anymore after r283981
Notes
Notes:
svn path=/head/; revision=283984
Diffstat (limited to 'lib/libutil/pw_util.c')
| -rw-r--r-- | lib/libutil/pw_util.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c index b0bdad15daba..befd1fb02d70 100644 --- a/lib/libutil/pw_util.c +++ b/lib/libutil/pw_util.c @@ -242,36 +242,14 @@ pw_tmp(int mfd) return (tfd); } -int -pw_mkdb(const char *user) -{ - - return (pw_mkdb2(user, PWDB_NATIVE)); -} - /* * Regenerate the password database. */ int -pw_mkdb2(const char *user, int endian) +pw_mkdb(const char *user) { int pstat; pid_t pid; - const char *arg; - - switch (endian) { - case PWDB_NATIVE: - arg = "-p"; - break; - case PWDB_LE: - arg = "-pL"; - break; - case PWDB_BE: - arg = "-pB"; - break; - default: - return (-1); - } (void)fflush(stderr); switch ((pid = fork())) { @@ -280,10 +258,10 @@ pw_mkdb2(const char *user, int endian) case 0: /* child */ if (user == NULL) - execl(_PATH_PWD_MKDB, "pwd_mkdb", arg, + execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", passwd_dir, tempname, (char *)NULL); else - execl(_PATH_PWD_MKDB, "pwd_mkdb", arg, + execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", passwd_dir, "-u", user, tempname, (char *)NULL); _exit(1); |