emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

[svn-upgrade] Integrating new upstream version, shadow (4.0.5)

Browse Source
This commit is contained in:
nekral-guest
2007-10-07 11:45:40 +00:00
parent e637799f9b
commit b0e078d9c8
177 changed files with 59452 additions and 14990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/chpasswd.c
View File

@@ -30,7 +30,7 @@
#include <config.h>
#include "rcsid.h"
RCSID (PKG_VER "$Id: chpasswd.c,v 1.18 2003/06/19 18:11:01 kloczek Exp $")
RCSID (PKG_VER "$Id: chpasswd.c,v 1.19 2004/10/11 06:26:40 kloczek Exp $")
#include <stdio.h>
#include "prototypes.h"
#include "defines.h"
@@ -105,6 +105,12 @@ int main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* XXX - use getopt() */
if (!(argc == 1 || (argc == 2 && !strcmp(argv[1], "-e"))))
usage();
if (argc == 2)
eflg = 1;
#ifdef USE_PAM
retval = PAM_SUCCESS;
@@ -115,7 +121,7 @@ int main (int argc, char **argv)
if (retval == PAM_SUCCESS) {
retval =
pam_start ("shadow", pampw->pw_name, &conv, &pamh);
pam_start ("chpasswd", pampw->pw_name, &conv, &pamh);
}
if (retval == PAM_SUCCESS) {
@@ -139,12 +145,6 @@ int main (int argc, char **argv)
}
#endif /* USE_PAM */
/* XXX - use getopt() */
if (!(argc == 1 || (argc == 2 && !strcmp (argv[1], "-e"))))
usage ();
if (argc == 2)
eflg = 1;
/*
* Lock the password file and open it for reading. This will bring
* all of the entries into memory where they may be updated.