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

- (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.

Browse Source 
ok djm@
This commit is contained in:
Darren Tucker 2004-06-03 14:53:12 +10:00
parent 26314f6354
commit 94befab9dd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20040603
- (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
ok djm@
20040601 20040601
- (djm) [auth-pam.c] Add copyright for local changes - (djm) [auth-pam.c] Add copyright for local changes
@ -1177,4 +1181,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.3373 2004/06/01 01:28:21 djm Exp $ $Id: ChangeLog,v 1.3374 2004/06/03 04:53:12 dtucker Exp $

10
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.105 2004/06/01 01:28:20 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.106 2004/06/03 04:53:12 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H) #if defined(HAVE_SECURITY_PAM_APPL_H)
@ -782,7 +782,7 @@ do_pam_setcred(int init)
} }
static int static int
pam_tty_conv(int n, const struct pam_message **msg, sshpam_tty_conv(int n, const 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];
@ -835,7 +835,7 @@ pam_tty_conv(int n, const struct pam_message **msg,
return (PAM_CONV_ERR); return (PAM_CONV_ERR);
} }
static struct pam_conv tty_conv = { pam_tty_conv, NULL }; static struct pam_conv tty_conv = { sshpam_tty_conv, NULL };
/* /*
* XXX this should be done in the authentication phase, but ssh1 doesn't * XXX this should be done in the authentication phase, but ssh1 doesn't
@ -859,7 +859,7 @@ do_pam_chauthtok(void)
} }
static int static int
pam_store_conv(int n, const struct pam_message **msg, sshpam_store_conv(int n, const struct pam_message **msg,
struct pam_response **resp, void *data) struct pam_response **resp, void *data)
{ {
struct pam_response *reply; struct pam_response *reply;
@ -901,7 +901,7 @@ pam_store_conv(int n, const struct pam_message **msg,
return (PAM_CONV_ERR); return (PAM_CONV_ERR);
} }
static struct pam_conv store_conv = { pam_store_conv, NULL }; static struct pam_conv store_conv = { sshpam_store_conv, NULL };
void void
do_pam_session(void) do_pam_session(void)