summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-10-02 16:26:34 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-10-02 16:26:34 +1000
commit0ccb59b85ccb393d7ac3c4e483b060644bed2e64 (patch)
treead22d7d397675b98c92abad0cf9820d3be3f02b0
parenta49d36e7b9727edf472750a249dd7655ae1594fd (diff)
- (dtucker) [configure.ac] Don't set DISABLE_SHADOW when configuring
--with-pam. ok djm@
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b8cd03252..ca696b1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
28 - markus@cvs.openbsd.org 2003/09/29 20:19:57 28 - markus@cvs.openbsd.org 2003/09/29 20:19:57
29 [servconf.c sshd_config] 29 [servconf.c sshd_config]
30 GSSAPICleanupCreds -> GSSAPICleanupCredentials 30 GSSAPICleanupCreds -> GSSAPICleanupCredentials
31 - (dtucker) [configure.ac] Don't set DISABLE_SHADOW when configuring
32 --with-pam. ok djm@
31 33
3220030930 3420030930
33 - (bal) Fix issues in openbsd-compat/realpath.c 35 - (bal) Fix issues in openbsd-compat/realpath.c
@@ -1263,4 +1265,4 @@
1263 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1265 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1264 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1266 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1265 1267
1266$Id: ChangeLog,v 1.3050 2003/10/02 06:20:54 dtucker Exp $ 1268$Id: ChangeLog,v 1.3051 2003/10/02 06:26:34 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 505907c30..dd22c98d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.168 2003/09/25 10:18:34 dtucker Exp $ 1# $Id: configure.ac,v 1.169 2003/10/02 06:26:34 dtucker Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -897,7 +897,6 @@ AC_ARG_WITH(pam,
897 AC_CHECK_FUNCS(pam_getenvlist) 897 AC_CHECK_FUNCS(pam_getenvlist)
898 AC_CHECK_FUNCS(pam_putenv) 898 AC_CHECK_FUNCS(pam_putenv)
899 899
900 disable_shadow=yes
901 PAM_MSG="yes" 900 PAM_MSG="yes"
902 901
903 AC_DEFINE(USE_PAM) 902 AC_DEFINE(USE_PAM)