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

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

View File

@ -30,7 +30,7 @@
#include <config.h>
#include "rcsid.h"
RCSID (PKG_VER "$Id: groupmod.c,v 1.22 2003/06/19 18:11:01 kloczek Exp $")
RCSID (PKG_VER "$Id: groupmod.c,v 1.24 2004/10/11 06:26:40 kloczek Exp $")
#include <sys/types.h>
#include <stdio.h>
#include <grp.h>
@ -339,7 +339,7 @@ static void check_new_name (void)
* All invalid group names land here.
*/
fprintf (stderr, _("%s: %s is a not a valid group name\n"),
fprintf (stderr, _("%s: %s is not a valid group name\n"),
Prog, group_newname);
exit (E_BAD_ARG);
}
@ -490,6 +490,8 @@ int main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
process_flags(argc, argv);
#ifdef USE_PAM
retval = PAM_SUCCESS;
@ -500,7 +502,7 @@ int main (int argc, char **argv)
if (retval == PAM_SUCCESS) {
retval =
pam_start ("shadow", pampw->pw_name, &conv, &pamh);
pam_start ("groupmod", pampw->pw_name, &conv, &pamh);
}
if (retval == PAM_SUCCESS) {
@ -524,7 +526,7 @@ int main (int argc, char **argv)
}
#endif /* USE_PAM */
OPENLOG (Prog);
OPENLOG ("groupmod");
#ifdef SHADOWGRP
is_shadow_grp = sgr_file_present ();
@ -541,7 +543,6 @@ int main (int argc, char **argv)
sg_dbm_mode = O_RDWR;
#endif /* SHADOWGRP */
#endif /* NDBM */
process_flags (argc, argv);
/*
* Start with a quick check to see if the group exists.