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

* libmisc/non_interactive_pam_conv.c,

Browse Source 
libmisc/pam_pass_non_interractive.c, libmisc/Makefile.am: Renamed.
	* libmisc/pam_pass_non_interractive.c, lib/prototypes.h:
	non_interactive_password and non_interactive_pam_conv do not need
	to be externally visible.
	* libmisc/pam_pass_non_interractive.c: Added declaration of
	ni_conv.
	* libmisc/pam_pass_non_interractive.c: Only compile ifdef USE_PAM.
	* libmisc/pam_pass_non_interractive.c, lib/prototypes.h:
	Added do_pam_passwd_non_interractive().
	* src/chpasswd.c: Use do_pam_passwd_non_interractive().
This commit is contained in:
nekral-guest
2009-05-09 13:15:25 +00:00
parent 19b672c3a4
commit d1534c53f7
5 changed files with 70 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/chpasswd.c
View File

@@ -465,35 +465,12 @@ int main (int argc, char **argv)
newpwd = cp;
#ifdef USE_PAM
pam_handle_t *pamh = NULL;
int ret;
ret = pam_start ("chpasswd", name, &non_interactive_pam_conv, &pamh);
if (ret != PAM_SUCCESS) {
if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) {
fprintf (stderr,
_("chpasswd: (user %s) pam_start failure %d\n"),
name, ret);
fprintf (stderr,
_("chpasswd: (user %s) password unchanged\n"),
name);
errors++;
continue;
_("%s: (line %d, user %s) password not changed\n"),
Prog, line, name);
error++;
}
non_interactive_password = newpwd;
ret = pam_chauthtok (pamh, 0);
if (ret != PAM_SUCCESS) {
fprintf (stderr, _("chpasswd: (line %d, user %s) pam_chauthtok() failed, error:\n"
" %s\n"),
line, name, pam_strerror (pamh, ret));
fprintf (stderr,
_("chpasswd: (line %d, user %s) password unchanged\n"),
line, name);
errors++;
continue;
}
(void) pam_end (pamh, PAM_SUCCESS);
#else /* !USE_PAM */
if ( !eflg
&& ( (NULL == crypt_method)