diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -73,6 +73,7 @@ | |||
73 | remove fatal callbacks from client code; ok deraadt | 73 | remove fatal callbacks from client code; ok deraadt |
74 | - (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john | 74 | - (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john |
75 | on #unixhelp@efnet | 75 | on #unixhelp@efnet |
76 | - (tim) [configure.ac] add --disable-etc-default-login option. ok djm | ||
76 | 77 | ||
77 | 20030919 | 78 | 20030919 |
78 | - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; | 79 | - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; |
@@ -1209,4 +1210,4 @@ | |||
1209 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1210 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1210 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1211 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1211 | 1212 | ||
1212 | $Id: ChangeLog,v 1.3037 2003/09/22 15:36:15 mouring Exp $ | 1213 | $Id: ChangeLog,v 1.3038 2003/09/23 02:50:14 tim Exp $ |
diff --git a/configure.ac b/configure.ac index ac1a4d9f3..dbb08fbb5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.164 2003/09/22 04:38:11 tim Exp $ | 1 | # $Id: configure.ac,v 1.165 2003/09/23 02:50:14 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -2215,11 +2215,15 @@ else | |||
2215 | fi | 2215 | fi |
2216 | 2216 | ||
2217 | # check for /etc/default/login and use it if present. | 2217 | # check for /etc/default/login and use it if present. |
2218 | AC_ARG_ENABLE(etc-default-login, | ||
2219 | [ --disable-etc-default-login Disable using PATH from /etc/default/login [no]],, | ||
2220 | [ | ||
2218 | AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ]) | 2221 | AC_CHECK_FILE("/etc/default/login", [ external_path_file=/etc/default/login ]) |
2219 | 2222 | ||
2220 | if test "x$external_path_file" = "x/etc/default/login"; then | 2223 | if test "x$external_path_file" = "x/etc/default/login"; then |
2221 | AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) | 2224 | AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN) |
2222 | fi | 2225 | fi |
2226 | ]) | ||
2223 | 2227 | ||
2224 | dnl BSD systems use /etc/login.conf so --with-default-path= has no effect | 2228 | dnl BSD systems use /etc/login.conf so --with-default-path= has no effect |
2225 | if test $ac_cv_func_login_getcapbool = "yes" -a \ | 2229 | if test $ac_cv_func_login_getcapbool = "yes" -a \ |