tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-25 10:58:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [auth-pam.c] Bug #705: Make arguments match PAM specs, fixes

Browse Source 
warnings on compliant platforms.  From paul.a.bolton at bt.com.  ok djm@
This commit is contained in:
Darren Tucker 2004-07-01 12:38:14 +10:00
parent 0a44d1ecf3
commit e2ba9c2e83
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20040701 20040701
- (dtucker) [session.c] Call display_loginmsg again after do_pam_session. - (dtucker) [session.c] Call display_loginmsg again after do_pam_session.
Ensures messages from PAM modules are displayed when privsep=no. Ensures messages from PAM modules are displayed when privsep=no.
- (dtucker) [auth-pam.c] Bug #705: Make arguments match PAM specs, fixes
warnings on compliant platforms. From paul.a.bolton at bt.com. ok djm@
20040630 20040630
- (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL
@ -1469,4 +1471,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3464 2004/06/30 23:48:29 dtucker Exp $ $Id: ChangeLog,v 1.3465 2004/07/01 02:38:14 dtucker Exp $

16
auth-pam.c
View File

@ -47,7 +47,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.108 2004/06/30 10:34:32 dtucker Exp $"); RCSID("$Id: auth-pam.c,v 1.109 2004/07/01 02:38:15 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #if defined(HAVE_SECURITY_PAM_APPL_H)
@ -264,7 +264,7 @@ import_environments(Buffer *b)
* Conversation function for authentication thread. * Conversation function for authentication thread.
*/ */
static int static int
sshpam_thread_conv(int n, const struct pam_message **msg, sshpam_thread_conv(int n, struct pam_message **msg,
struct pam_response **resp, void *data) struct pam_response **resp, void *data)
{ {
Buffer buffer; Buffer buffer;
@ -362,7 +362,7 @@ sshpam_thread(void *ctxtp)
u_int i; u_int i;
const char *pam_user; const char *pam_user;
pam_get_item(sshpam_handle, PAM_USER, (const void **)&pam_user); pam_get_item(sshpam_handle, PAM_USER, (void **)&pam_user);
setproctitle("%s [pam]", pam_user); setproctitle("%s [pam]", pam_user);
environ[0] = NULL; environ[0] = NULL;
#endif #endif
@ -450,7 +450,7 @@ sshpam_thread_cleanup(void)
} }
static int static int
sshpam_null_conv(int n, const struct pam_message **msg, sshpam_null_conv(int n, struct pam_message **msg,
struct pam_response **resp, void *data) struct pam_response **resp, void *data)
{ {
debug3("PAM: %s entering, %d messages", __func__, n); debug3("PAM: %s entering, %d messages", __func__, n);
@ -488,7 +488,7 @@ sshpam_init(Authctxt *authctxt)
if (sshpam_handle != NULL) { if (sshpam_handle != NULL) {
/* We already have a PAM context; check if the user matches */ /* We already have a PAM context; check if the user matches */
sshpam_err = pam_get_item(sshpam_handle, sshpam_err = pam_get_item(sshpam_handle,
PAM_USER, (const void **)&pam_user); PAM_USER, (void **)&pam_user);
if (sshpam_err == PAM_SUCCESS && strcmp(user, pam_user) == 0) if (sshpam_err == PAM_SUCCESS && strcmp(user, pam_user) == 0)
return (0); return (0);
pam_end(sshpam_handle, sshpam_err); pam_end(sshpam_handle, sshpam_err);
@ -786,7 +786,7 @@ do_pam_setcred(int init)
} }
static int static int
sshpam_tty_conv(int n, const struct pam_message **msg, sshpam_tty_conv(int n, struct pam_message **msg,
struct pam_response **resp, void *data) struct pam_response **resp, void *data)
{ {
char input[PAM_MAX_MSG_SIZE]; char input[PAM_MAX_MSG_SIZE];
@ -863,7 +863,7 @@ do_pam_chauthtok(void)
} }
static int static int
sshpam_store_conv(int n, const struct pam_message **msg, sshpam_store_conv(int n, struct pam_message **msg,
struct pam_response **resp, void *data) struct pam_response **resp, void *data)
{ {
struct pam_response *reply; struct pam_response *reply;
@ -978,7 +978,7 @@ free_pam_environment(char **env)
* display. * display.
*/ */
static int static int
sshpam_passwd_conv(int n, const struct pam_message **msg, sshpam_passwd_conv(int n, struct pam_message **msg,
struct pam_response **resp, void *data) struct pam_response **resp, void *data)
{ {
struct pam_response *reply; struct pam_response *reply;