summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-02 11:04:39 +1000
committerDamien Miller <djm@mindrot.org>2003-06-02 11:04:39 +1000
commit46337202d456b0c970e50a9e78fbf58da46f17a8 (patch)
treebd2fc7e50b13928bc623c5a0510bfd3f0fdf5934
parentae22174b219392223606a11b8930a5f70698f72c (diff)
- (djm) Fix segv from bad reordering in auth-pam.c
-rw-r--r--auth-pam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-pam.c b/auth-pam.c
index 0dcdb651d..b8381646b 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -31,7 +31,7 @@
31 31
32/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 32/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
33#include "includes.h" 33#include "includes.h"
34RCSID("$Id: auth-pam.c,v 1.62 2003/05/18 10:45:48 djm Exp $"); 34RCSID("$Id: auth-pam.c,v 1.63 2003/06/02 01:04:39 djm Exp $");
35 35
36#ifdef USE_PAM 36#ifdef USE_PAM
37#include <security/pam_appl.h> 37#include <security/pam_appl.h>
@@ -299,9 +299,9 @@ sshpam_init(const char *user)
299 sshpam_handle = NULL; 299 sshpam_handle = NULL;
300 return (-1); 300 return (-1);
301 } 301 }
302 debug("PAM: setting PAM_RHOST to \"%s\"", pam_rhost);
303 pam_rhost = get_remote_name_or_ip(utmp_len, 302 pam_rhost = get_remote_name_or_ip(utmp_len,
304 options.verify_reverse_mapping); 303 options.verify_reverse_mapping);
304 debug("PAM: setting PAM_RHOST to \"%s\"", pam_rhost);
305 sshpam_err = pam_set_item(sshpam_handle, PAM_RHOST, pam_rhost); 305 sshpam_err = pam_set_item(sshpam_handle, PAM_RHOST, pam_rhost);
306 if (sshpam_err != PAM_SUCCESS) { 306 if (sshpam_err != PAM_SUCCESS) {
307 pam_end(sshpam_handle, sshpam_err); 307 pam_end(sshpam_handle, sshpam_err);