diff options
author | bapt <bapt@FreeBSD.org> | 2015-06-04 08:00:11 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-06-04 08:00:11 +0000 |
commit | 87ba98d64969e2d06f905545cc13c501c2305b55 (patch) | |
tree | 8a4d0e5aaa9028e262f19edcb4dd4844bb8f7b2a /lib/libutil | |
parent | 6fba020c2a2a17c012bea09aa55a6e7be64c875d (diff) | |
download | FreeBSD-src-87ba98d64969e2d06f905545cc13c501c2305b55.zip FreeBSD-src-87ba98d64969e2d06f905545cc13c501c2305b55.tar.gz |
revert r283969,283970 not needed anymore after r283981
Diffstat (limited to 'lib/libutil')
-rw-r--r-- | lib/libutil/Makefile | 1 | ||||
-rw-r--r-- | lib/libutil/libutil.h | 4 | ||||
-rw-r--r-- | lib/libutil/pw_util.3 | 24 | ||||
-rw-r--r-- | lib/libutil/pw_util.c | 28 |
4 files changed, 4 insertions, 53 deletions
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index 2214339..2f68628 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -78,7 +78,6 @@ MLINKS+=pw_util.3 pw_copy.3 \ pw_util.3 pw_make.3 \ pw_util.3 pw_make_v7.3 \ pw_util.3 pw_mkdb.3 \ - pw_util.3 pw_mkdb2.3 \ pw_util.3 pw_lock.3 \ pw_util.3 pw_scan.3 \ pw_util.3 pw_tempname.3 \ diff --git a/lib/libutil/libutil.h b/lib/libutil/libutil.h index fc32fe7..b20ffa2 100644 --- a/lib/libutil/libutil.h +++ b/lib/libutil/libutil.h @@ -144,9 +144,6 @@ char *fparseln(FILE *_fp, size_t *_len, size_t *_lineno, #endif #ifdef _PWD_H_ -#define PWDB_NATIVE 0 -#define PWDB_LE 1 -#define PWDB_BE 2 int pw_copy(int _ffd, int _tfd, const struct passwd *_pw, struct passwd *_old_pw); struct passwd @@ -158,7 +155,6 @@ int pw_init(const char *_dir, const char *_master); char *pw_make(const struct passwd *_pw); char *pw_make_v7(const struct passwd *_pw); int pw_mkdb(const char *_user); -int pw_mkdb2(const char *_user, int endian); int pw_lock(void); struct passwd * pw_scan(const char *_line, int _flags); diff --git a/lib/libutil/pw_util.3 b/lib/libutil/pw_util.3 index 004ee5d..706368f 100644 --- a/lib/libutil/pw_util.3 +++ b/lib/libutil/pw_util.3 @@ -37,7 +37,6 @@ .Nm pw_make , .Nm pw_make_v7 , .Nm pw_mkdb , -.Nm pw_mkdb2 , .Nm pw_lock , .Nm pw_scan , .Nm pw_tempname , @@ -67,8 +66,6 @@ .Ft int .Fn pw_mkdb "const char *user" .Ft int -.Fn pw_mkdb "const char *user" "int endian" -.Ft int .Fn pw_lock "void" .Ft "struct passwd *" .Fn pw_scan "const char *line" "int flags" @@ -228,30 +225,11 @@ function regenerates the password database by running .Xr pwd_mkdb 8 . If .Fa user -is set, only the record corresponding to that user will be updated. +only the record corresponding to that user will be updated. The .Fn pw_mkdb function returns 0 in case of success and -1 in case of failure. .Pp -.Fn pw_mkdb2 -function regenerates the password database by running -.Xr pwd_mkdb 8 . -If -.Fa user -is set, only the record corresponding to that user will be updated. -.Pp -The -.Fa endian -variable can take the following values -.Bl -tag -width PWDB_NATIVE -.It Dv PWDB_NATIVE -The database will be generated in host native endianness. -.It Dv PWDB_LE -The database will be generated in Little-endian. -.It Dv PWDB_BE -The database will be generated in Big-endian. -.El -.Pp The .Fn pw_lock function locks the master password file. diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c index b0bdad1..befd1fb 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); |