d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Stop shadowing global "pamh" by a local variable in auth_pam().

Browse Source 
- Stop calling pam_strerror() with NULL pamh.
- Add a missing call to pam_end().

PR:		bin/59776
Submitted by:	Nick Leuta <see PR for email>
MFC after:	2 weeks
This commit is contained in:
Yaroslav Tykhiy 2004-10-30 17:30:56 +00:00
parent c29b9b4797
commit de45162d8c
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libexec/ftpd/ftpd.c
View File

@ -1171,13 +1171,15 @@ end_login(void)
LOGIN_SETMAC); LOGIN_SETMAC);
#endif #endif
#ifdef USE_PAM #ifdef USE_PAM
if ((e = pam_setcred(pamh, PAM_DELETE_CRED)) != PAM_SUCCESS) if (pamh) {
syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, e)); if ((e = pam_setcred(pamh, PAM_DELETE_CRED)) != PAM_SUCCESS)
if ((e = pam_close_session(pamh,0)) != PAM_SUCCESS) syslog(LOG_ERR, "pam_setcred: %s", pam_strerror(pamh, e));
syslog(LOG_ERR, "pam_close_session: %s", pam_strerror(pamh, e)); if ((e = pam_close_session(pamh,0)) != PAM_SUCCESS)
if ((e = pam_end(pamh, e)) != PAM_SUCCESS) syslog(LOG_ERR, "pam_close_session: %s", pam_strerror(pamh, e));
syslog(LOG_ERR, "pam_end: %s", pam_strerror(pamh, e)); if ((e = pam_end(pamh, e)) != PAM_SUCCESS)
pamh = NULL; syslog(LOG_ERR, "pam_end: %s", pam_strerror(pamh, e));
pamh = NULL;
}
#endif #endif
logged_in = 0; logged_in = 0;
guest = 0; guest = 0;
@ -1247,7 +1249,6 @@ auth_conv(int num_msg, const struct pam_message **msg,
static int static int
auth_pam(struct passwd **ppw, const char *pass) auth_pam(struct passwd **ppw, const char *pass)
{ {
pam_handle_t *pamh = NULL;
const char *tmpl_user; const char *tmpl_user;
const void *item; const void *item;
int rval; int rval;
@ -1257,7 +1258,8 @@ auth_pam(struct passwd **ppw, const char *pass)
e = pam_start("ftpd", (*ppw)->pw_name, &conv, &pamh); e = pam_start("ftpd", (*ppw)->pw_name, &conv, &pamh);
if (e != PAM_SUCCESS) { if (e != PAM_SUCCESS) {
syslog(LOG_ERR, "pam_start: %s", pam_strerror(pamh, e)); /* pamh is NULL, cannot use pam_strerror() */
syslog(LOG_ERR, "pam_start failed");
return -1; return -1;
} }
@ -1265,6 +1267,10 @@ auth_pam(struct passwd **ppw, const char *pass)
if (e != PAM_SUCCESS) { if (e != PAM_SUCCESS) {
syslog(LOG_ERR, "pam_set_item(PAM_RHOST): %s", syslog(LOG_ERR, "pam_set_item(PAM_RHOST): %s",
pam_strerror(pamh, e)); pam_strerror(pamh, e));
if ((e = pam_end(pamh, e)) != PAM_SUCCESS) {
syslog(LOG_ERR, "pam_end: %s", pam_strerror(pamh, e));
}
pamh = NULL;
return -1; return -1;
} }