* libmisc/non_interactive_pam_conv.c,
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:
parent
19b672c3a4
commit
d1534c53f7
14
ChangeLog
14
ChangeLog
@ -1,3 +1,17 @@
|
|||||||
|
2009-05-07 Nicolas François <nicolas.francois@centraliens.net>
|
||||||
|
|
||||||
|
* libmisc/non_interactive_pam_conv.c,
|
||||||
|
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().
|
||||||
|
|
||||||
2009-05-07 Nicolas François <nicolas.francois@centraliens.net>
|
2009-05-07 Nicolas François <nicolas.francois@centraliens.net>
|
||||||
|
|
||||||
* libmisc/pam_pass.c: Removed comment regarding pam_misc. This is
|
* libmisc/pam_pass.c: Removed comment regarding pam_misc. This is
|
||||||
|
@ -238,9 +238,10 @@ extern void motd (void);
|
|||||||
/* myname.c */
|
/* myname.c */
|
||||||
extern /*@null@*/struct passwd *get_my_pwent (void);
|
extern /*@null@*/struct passwd *get_my_pwent (void);
|
||||||
|
|
||||||
/* non_interactive_pam_conv.c */
|
/* pam_pass_non_interractive.c */
|
||||||
/*@null@*/ /*@only@*/extern char *non_interactive_password;
|
extern int do_pam_passwd_non_interractive (const char *pam_service,
|
||||||
extern struct pam_conv non_interactive_pam_conv;
|
const char *username,
|
||||||
|
const char* password)
|
||||||
|
|
||||||
/* obscure.c */
|
/* obscure.c */
|
||||||
#ifndef USE_PAM
|
#ifndef USE_PAM
|
||||||
|
@ -38,9 +38,9 @@ libmisc_a_SOURCES = \
|
|||||||
mail.c \
|
mail.c \
|
||||||
motd.c \
|
motd.c \
|
||||||
myname.c \
|
myname.c \
|
||||||
non_interactive_pam_conv.c \
|
|
||||||
obscure.c \
|
obscure.c \
|
||||||
pam_pass.c \
|
pam_pass.c \
|
||||||
|
pam_pass_non_interractive.c \
|
||||||
pwd2spwd.c \
|
pwd2spwd.c \
|
||||||
pwdcheck.c \
|
pwdcheck.c \
|
||||||
pwd_init.c \
|
pwd_init.c \
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
|
|
||||||
#ident "$Id:$"
|
#ident "$Id:$"
|
||||||
|
|
||||||
|
#ifdef USE_PAM
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@ -38,13 +39,23 @@
|
|||||||
#include <security/pam_appl.h>
|
#include <security/pam_appl.h>
|
||||||
#include "prototypes.h"
|
#include "prototypes.h"
|
||||||
|
|
||||||
/*@null@*/ /*@only@*/char *non_interactive_password = NULL;
|
/*@null@*/ /*@only@*/static char *non_interactive_password = NULL;
|
||||||
|
static int ni_conv (int num_msg,
|
||||||
|
const struct pam_message **msg,
|
||||||
|
struct pam_response **resp,
|
||||||
|
unused void *appdata_ptr);
|
||||||
|
static struct pam_conv non_interactive_pam_conv = {
|
||||||
|
ni_conv,
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static int ni_conv (int num_msg,
|
static int ni_conv (int num_msg,
|
||||||
const struct pam_message **msg,
|
const struct pam_message **msg,
|
||||||
struct pam_response **resp,
|
struct pam_response **resp,
|
||||||
unused void *appdata_ptr) {
|
unused void *appdata_ptr)
|
||||||
|
{
|
||||||
struct pam_response *responses;
|
struct pam_response *responses;
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
@ -117,8 +128,38 @@ failed_conversation:
|
|||||||
return PAM_CONV_ERR;
|
return PAM_CONV_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct pam_conv non_interactive_pam_conv = {
|
|
||||||
ni_conv,
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Change non interactively the user's password using PAM.
|
||||||
|
*
|
||||||
|
* Return 0 on success, 1 on failure.
|
||||||
|
*/
|
||||||
|
int do_pam_passwd_non_interractive (const char *pam_service,
|
||||||
|
const char *username,
|
||||||
|
const char* password)
|
||||||
|
{
|
||||||
|
pam_handle_t *pamh = NULL;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = pam_start (pam_service, username, &non_interactive_pam_conv, &pamh);
|
||||||
|
if (ret != PAM_SUCCESS) {
|
||||||
|
fprintf (stderr,
|
||||||
|
_("%s: (user %s) pam_start failure %d\n"),
|
||||||
|
Prog, username, ret);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
non_interactive_password = password;
|
||||||
|
ret = pam_chauthtok (pamh, 0);
|
||||||
|
if (ret != PAM_SUCCESS) {
|
||||||
|
fprintf (stderr,
|
||||||
|
_("%s: (user %s) pam_chauthtok() failed, error:\n"
|
||||||
|
"%s\n"),
|
||||||
|
Prog, username, pam_strerror (pamh, ret));
|
||||||
|
}
|
||||||
|
|
||||||
|
(void) pam_end (pamh, PAM_SUCCESS);
|
||||||
|
}
|
||||||
|
#else /* !USE_PAM */
|
||||||
|
extern int errno; /* warning: ANSI C forbids an empty source file */
|
||||||
|
#endif /* !USE_PAM */
|
@ -465,35 +465,12 @@ int main (int argc, char **argv)
|
|||||||
newpwd = cp;
|
newpwd = cp;
|
||||||
|
|
||||||
#ifdef USE_PAM
|
#ifdef USE_PAM
|
||||||
pam_handle_t *pamh = NULL;
|
if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) {
|
||||||
int ret;
|
|
||||||
ret = pam_start ("chpasswd", name, &non_interactive_pam_conv, &pamh);
|
|
||||||
if (ret != PAM_SUCCESS) {
|
|
||||||
fprintf (stderr,
|
fprintf (stderr,
|
||||||
_("chpasswd: (user %s) pam_start failure %d\n"),
|
_("%s: (line %d, user %s) password not changed\n"),
|
||||||
name, ret);
|
Prog, line, name);
|
||||||
fprintf (stderr,
|
error++;
|
||||||
_("chpasswd: (user %s) password unchanged\n"),
|
|
||||||
name);
|
|
||||||
errors++;
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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 */
|
#else /* !USE_PAM */
|
||||||
if ( !eflg
|
if ( !eflg
|
||||||
&& ( (NULL == crypt_method)
|
&& ( (NULL == crypt_method)
|
||||||
|
Loading…
Reference in New Issue
Block a user