summaryrefslogtreecommitdiff
path: root/auth-pam.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-07-17 17:04:47 +1000
committerDamien Miller <djm@mindrot.org>2005-07-17 17:04:47 +1000
commit94cf4c8448bab8f1ad563868089bb0ea1ff92213 (patch)
tree1a0752ba64d6b7ccfdcd824ad55a76523e659a87 /auth-pam.c
parent46d38de48b1018c74040d2399bafbedf50247529 (diff)
- (djm) [acss.c auth-pam.c auth-shadow.c auth-skey.c auth1.c canohost.c]
[cipher-acss.c loginrec.c ssh-rand-helper.c sshd.c] Fix whitespace at EOL in portable too ("perl -p -i -e 's/\s+$/\n/' *.[ch]")
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/auth-pam.c b/auth-pam.c
index fecba5de0..4a2841924 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,7 @@
47 47
48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
49#include "includes.h" 49#include "includes.h"
50RCSID("$Id: auth-pam.c,v 1.124 2005/07/16 01:33:06 dtucker Exp $"); 50RCSID("$Id: auth-pam.c,v 1.125 2005/07/17 07:04:47 djm Exp $");
51 51
52#ifdef USE_PAM 52#ifdef USE_PAM
53#if defined(HAVE_SECURITY_PAM_APPL_H) 53#if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -123,7 +123,7 @@ static struct pam_ctxt *cleanup_ctxt;
123static int sshpam_thread_status = -1; 123static int sshpam_thread_status = -1;
124static mysig_t sshpam_oldsig; 124static mysig_t sshpam_oldsig;
125 125
126static void 126static void
127sshpam_sigchld_handler(int sig) 127sshpam_sigchld_handler(int sig)
128{ 128{
129 signal(SIGCHLD, SIG_DFL); 129 signal(SIGCHLD, SIG_DFL);
@@ -853,7 +853,7 @@ do_pam_account(void)
853 sshpam_err = pam_acct_mgmt(sshpam_handle, 0); 853 sshpam_err = pam_acct_mgmt(sshpam_handle, 0);
854 debug3("PAM: %s pam_acct_mgmt = %d (%s)", __func__, sshpam_err, 854 debug3("PAM: %s pam_acct_mgmt = %d (%s)", __func__, sshpam_err,
855 pam_strerror(sshpam_handle, sshpam_err)); 855 pam_strerror(sshpam_handle, sshpam_err));
856 856
857 if (sshpam_err != PAM_SUCCESS && sshpam_err != PAM_NEW_AUTHTOK_REQD) { 857 if (sshpam_err != PAM_SUCCESS && sshpam_err != PAM_NEW_AUTHTOK_REQD) {
858 sshpam_account_status = 0; 858 sshpam_account_status = 0;
859 return (sshpam_account_status); 859 return (sshpam_account_status);
@@ -1111,7 +1111,7 @@ sshpam_passwd_conv(int n, sshpam_const struct pam_message **msg,
1111 *resp = reply; 1111 *resp = reply;
1112 return (PAM_SUCCESS); 1112 return (PAM_SUCCESS);
1113 1113
1114 fail: 1114 fail:
1115 for(i = 0; i < n; i++) { 1115 for(i = 0; i < n; i++) {
1116 if (reply[i].resp != NULL) 1116 if (reply[i].resp != NULL)
1117 xfree(reply[i].resp); 1117 xfree(reply[i].resp);