d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The pwdb function is only used once to check the database rename it

Browse Source 
pwdb_check and simplify it accordingly
This commit is contained in:
Baptiste Daroussin 2015-05-10 09:23:03 +00:00
parent b1a215787d
commit 35ddfb6d6c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/pw/pwupd.c
View File

@ -33,7 +33,6 @@ static const char rcsid[] =
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
#include <pwd.h>
#include <libutil.h>
#include <errno.h>
@ -72,19 +71,15 @@ getpwpath(char const * file)
}
static int
pwdb(char *arg,...)
pwdb_check(void)
{
int i = 0;
pid_t pid;
va_list ap;
char *args[10];
args[i++] = _PATH_PWD_MKDB;
va_start(ap, arg);
while (i < 6 && arg != NULL) {
args[i++] = arg;
arg = va_arg(ap, char *);
}
args[i++] = "-C";
if (pwpath != pathpwd) {
args[i++] = "-d";
args[i++] = pwpath;
@ -102,7 +97,6 @@ pwdb(char *arg,...)
if (WEXITSTATUS(i))
i = EIO;
}
va_end(ap);
return (i);
}
@ -114,7 +108,7 @@ pw_update(struct passwd * pwd, char const * user)
struct passwd *old_pw = NULL;
int rc, pfd, tfd;
if ((rc = pwdb("-C", NULL)) != 0)
if ((rc = pwdb_check()) != 0)
return (rc);
if (pwd != NULL)