- (stevesk) [auth-pam.c] cast to avoid initialization type mismatch

warning on pam_conv struct conversation function.
This commit is contained in:
Kevin Steves 2002-07-21 22:49:47 +00:00
parent 63007d42ee
commit 3429a1bf60
2 changed files with 5 additions and 3 deletions

View File

@ -3,6 +3,8 @@
openssh-3.4p1-owl-password-changing.diff openssh-3.4p1-owl-password-changing.diff
- (stevesk) [auth-pam.c] merge rest of solar's PAM patch; - (stevesk) [auth-pam.c] merge rest of solar's PAM patch;
PAM_NEW_AUTHTOK_REQD remains in #if 0 for now. PAM_NEW_AUTHTOK_REQD remains in #if 0 for now.
- (stevesk) [auth-pam.c] cast to avoid initialization type mismatch
warning on pam_conv struct conversation function.
20020720 20020720
- (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
@ -1403,4 +1405,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2382 2002/07/21 17:57:01 stevesk Exp $ $Id: ChangeLog,v 1.2383 2002/07/21 22:49:47 stevesk Exp $

View File

@ -39,7 +39,7 @@ extern char *__progname;
extern int use_privsep; extern int use_privsep;
RCSID("$Id: auth-pam.c,v 1.49 2002/07/21 17:57:01 stevesk Exp $"); RCSID("$Id: auth-pam.c,v 1.50 2002/07/21 22:49:47 stevesk Exp $");
#define NEW_AUTHTOK_MSG \ #define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now." "Warning: Your password has expired, please change it now."
@ -51,7 +51,7 @@ static int do_pam_conversation(int num_msg, const struct pam_message **msg,
/* module-local variables */ /* module-local variables */
static struct pam_conv conv = { static struct pam_conv conv = {
do_pam_conversation, (int (*)())do_pam_conversation,
NULL NULL
}; };
static char *__pam_msg = NULL; static char *__pam_msg = NULL;