summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac29
2 files changed, 26 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 66a2b9a04..143727d6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120020417 120020417
2 - (djm) Tell users to configure /dev/random support into OpenSSL in INSTALL 2 - (djm) Tell users to configure /dev/random support into OpenSSL in INSTALL
3 - (djm) Fix .Nm in mdoc2man.pl from pspencer@fields.utoronto.ca 3 - (djm) Fix .Nm in mdoc2man.pl from pspencer@fields.utoronto.ca
4 - (tim) [configure.ac] Issue warning on --with-default-path=/some_path
5 if LOGIN_CAP is enabled. Report & testing by Tuc <tuc@ttsg.com>
4 6
520020415 720020415
6 - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au> 8 - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au>
@@ -8252,4 +8254,4 @@
8252 - Wrote replacements for strlcpy and mkdtemp 8254 - Wrote replacements for strlcpy and mkdtemp
8253 - Released 1.0pre1 8255 - Released 1.0pre1
8254 8256
8255$Id: ChangeLog,v 1.2058 2002/04/17 02:30:45 djm Exp $ 8257$Id: ChangeLog,v 1.2059 2002/04/18 04:19:14 tim Exp $
diff --git a/configure.ac b/configure.ac
index d9ca33d69..6b2dfe212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.45 2002/04/16 04:10:11 tim Exp $ 1# $Id: configure.ac,v 1.46 2002/04/18 04:19:15 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -2019,17 +2019,28 @@ else
2019 ) 2019 )
2020fi 2020fi
2021 2021
2022dnl BSD systems use /etc/login.conf so --with-default-path= has no effect
2023if test $ac_cv_func_login_getcapbool = "yes" -a \
2024 $ac_cv_header_login_cap_h = "yes" ; then
2025 USES_LOGIN_CONF=yes
2026fi
2022# Whether to mess with the default path 2027# Whether to mess with the default path
2023SERVER_PATH_MSG="(default)" 2028SERVER_PATH_MSG="(default)"
2024AC_ARG_WITH(default-path, 2029AC_ARG_WITH(default-path,
2025 [ --with-default-path=PATH Specify default \$PATH environment for server], 2030 [ --with-default-path=PATH Specify default \$PATH environment for server],
2026 [ 2031 [
2027 if test "x$withval" != "xno" ; then 2032 if test "$USES_LOGIN_CONF" = "yes" ; then
2033 AC_MSG_WARN([
2034--with-default-path=PATH has no effect on this system.
2035Edit /etc/login.conf instead.])
2036 elif test "x$withval" != "xno" ; then
2028 user_path="$withval" 2037 user_path="$withval"
2029 SERVER_PATH_MSG="$withval" 2038 SERVER_PATH_MSG="$withval"
2030 fi 2039 fi
2031 ], 2040 ],
2032 [ 2041 [ if test "$USES_LOGIN_CONF" = "yes" ; then
2042 AC_MSG_WARN([Make sure the path to scp is in /etc/login.conf])
2043 else
2033 AC_TRY_RUN( 2044 AC_TRY_RUN(
2034 [ 2045 [
2035/* find out what STDPATH is */ 2046/* find out what STDPATH is */
@@ -2079,10 +2090,12 @@ main()
2079 AC_MSG_RESULT(Adding $t_bindir to USER_PATH so scp will work) 2090 AC_MSG_RESULT(Adding $t_bindir to USER_PATH so scp will work)
2080 fi 2091 fi
2081 fi 2092 fi
2082 ] 2093 fi ]
2083) 2094)
2084AC_DEFINE_UNQUOTED(USER_PATH, "$user_path") 2095if test "$USES_LOGIN_CONF" != "yes" ; then
2085AC_SUBST(user_path) 2096 AC_DEFINE_UNQUOTED(USER_PATH, "$user_path")
2097 AC_SUBST(user_path)
2098fi
2086 2099
2087# Whether to force IPv4 by default (needed on broken glibc Linux) 2100# Whether to force IPv4 by default (needed on broken glibc Linux)
2088IPV4_HACK_MSG="no" 2101IPV4_HACK_MSG="no"
@@ -2433,7 +2446,11 @@ echo " Configuration files: $D"
2433echo " Askpass program: $E" 2446echo " Askpass program: $E"
2434echo " Manual pages: $F" 2447echo " Manual pages: $F"
2435echo " PID file: $G" 2448echo " PID file: $G"
2449if test "$USES_LOGIN_CONF" = "yes" ; then
2450echo " At runtime, sshd will use the path defined in /etc/login.conf"
2451else
2436echo " sshd default user PATH: $H" 2452echo " sshd default user PATH: $H"
2453fi
2437echo " Manpage format: $MANTYPE" 2454echo " Manpage format: $MANTYPE"
2438echo " PAM support: ${PAM_MSG}" 2455echo " PAM support: ${PAM_MSG}"
2439echo " KerberosIV support: $KRB4_MSG" 2456echo " KerberosIV support: $KRB4_MSG"