[svn-upgrade] Integrating new upstream version, shadow (4.0.4)
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
#ifdef USE_PAM
|
||||
|
||||
#include "rcsid.h"
|
||||
RCSID("$Id: pam_pass.c,v 1.7 2001/06/28 20:47:06 kloczek Exp $")
|
||||
RCSID ("$Id: pam_pass.c,v 1.9 2003/07/29 09:05:39 kloczek Exp $")
|
||||
|
||||
/*
|
||||
* Change the user's password using PAM. Requires libpam and libpam_misc
|
||||
@ -11,23 +11,18 @@ RCSID("$Id: pam_pass.c,v 1.7 2001/06/28 20:47:06 kloczek Exp $")
|
||||
* so you may have to port it if you want to use this code on non-Linux
|
||||
* systems with PAM (such as Solaris 2.6). --marekm
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "defines.h"
|
||||
|
||||
#include "pam_defs.h"
|
||||
|
||||
static const struct pam_conv conv = {
|
||||
misc_conv,
|
||||
NULL
|
||||
};
|
||||
|
||||
void
|
||||
do_pam_passwd(const char *user, int silent, int change_expired)
|
||||
void do_pam_passwd (const char *user, int silent, int change_expired)
|
||||
{
|
||||
pam_handle_t *pamh = NULL;
|
||||
int flags = 0, ret;
|
||||
@ -37,22 +32,24 @@ do_pam_passwd(const char *user, int silent, int change_expired)
|
||||
if (change_expired)
|
||||
flags |= PAM_CHANGE_EXPIRED_AUTHTOK;
|
||||
|
||||
ret = pam_start("passwd", user, &conv, &pamh);
|
||||
ret = pam_start ("passwd", user, &conv, &pamh);
|
||||
if (ret != PAM_SUCCESS) {
|
||||
fprintf(stderr, _("passwd: pam_start() failed, error %d\n"),
|
||||
ret);
|
||||
exit(10); /* XXX */
|
||||
fprintf (stderr,
|
||||
_("passwd: pam_start() failed, error %d\n"), ret);
|
||||
exit (10); /* XXX */
|
||||
}
|
||||
|
||||
ret = pam_chauthtok(pamh, flags);
|
||||
ret = pam_chauthtok (pamh, flags);
|
||||
if (ret != PAM_SUCCESS) {
|
||||
fprintf(stderr, _("passwd: %s\n"), pam_strerror(pamh, ret));
|
||||
pam_end(pamh, ret);
|
||||
exit(10); /* XXX */
|
||||
fprintf (stderr, _("passwd: %s\n"),
|
||||
pam_strerror (pamh, ret));
|
||||
pam_end (pamh, ret);
|
||||
exit (10); /* XXX */
|
||||
}
|
||||
|
||||
pam_end(pamh, PAM_SUCCESS);
|
||||
fputs(_("passwd: password updated successfully\n"), stderr);
|
||||
pam_end (pamh, PAM_SUCCESS);
|
||||
}
|
||||
#else /* !USE_PAM */
|
||||
extern int errno; /* warning: ANSI C forbids an empty source file */
|
||||
#endif /* !USE_PAM */
|
||||
#else /* !USE_PAM */
|
||||
extern int errno; /* warning: ANSI C forbids an empty source file */
|
||||
#endif /* !USE_PAM */
|
||||
|
Reference in New Issue
Block a user