summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 643aafa92..46700ecf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
29 Report by distler AT golem ph utexas edu. 29 Report by distler AT golem ph utexas edu.
30 - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from 30 - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from
31 article by genty at austin.ibm.com, included with the author's permission. 31 article by genty at austin.ibm.com, included with the author's permission.
32 - (tim) [configure.ac] add --disable-etc-default-login option. ok djm
32 33
3320030919 3420030919
34 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; 35 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1161,4 +1162,4 @@
1161 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1162 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1162 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1163 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1163 1164
1164$Id: ChangeLog,v 1.2994.2.26 2003/09/22 10:42:16 dtucker Exp $ 1165$Id: ChangeLog,v 1.2994.2.27 2003/09/23 02:51:36 tim Exp $
diff --git a/configure.ac b/configure.ac
index 15f6e1f43..716431080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.154.2.9 2003/09/22 04:39:14 tim Exp $ 1# $Id: configure.ac,v 1.154.2.10 2003/09/23 02:51:37 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -2215,11 +2215,15 @@ else
2215fi 2215fi
2216 2216
2217# check for /etc/default/login and use it if present. 2217# check for /etc/default/login and use it if present.
2218AC_ARG_ENABLE(etc-default-login,
2219 [ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],,
2220[
2218AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ]) 2221AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ])
2219 2222
2220if test "x$external_path_file" = "x/etc/default/login"; then 2223if test "x$external_path_file" = "x/etc/default/login"; then
2221 AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) 2224 AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
2222fi 2225fi
2226])
2223 2227
2224dnl BSD systems use /etc/login.conf so --with-default-path= has no effect 2228dnl BSD systems use /etc/login.conf so --with-default-path= has no effect
2225if test $ac_cv_func_login_getcapbool = "yes" -a \ 2229if test $ac_cv_func_login_getcapbool = "yes" -a \