diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-07 14:37:00 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-07 14:37:00 +0000 |
commit | 3545352dc4ae245ebadc3e11ca250248ce2b99e3 (patch) | |
tree | eb194a43ab3d18e91a9320e54d182e6d2079cb81 /configure.ac | |
parent | 03bab2861e1f601aac06ada43277c26509c8886b (diff) |
- (bal) Missed __progname in ssh-keysign.c patch by dtucker@zip.com.au
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 628adb392..59d61fd65 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.64 2002/05/28 00:37:33 tim Exp $ | 1 | # $Id: configure.ac,v 1.65 2002/06/07 14:37:00 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -230,13 +230,11 @@ mips-sony-bsd|mips-sony-newsos4) | |||
230 | *-*-sysv4.2*) | 230 | *-*-sysv4.2*) |
231 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 231 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
232 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 232 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
233 | # enable_suid_ssh=no | ||
234 | AC_DEFINE(USE_PIPES) | 233 | AC_DEFINE(USE_PIPES) |
235 | ;; | 234 | ;; |
236 | *-*-sysv5*) | 235 | *-*-sysv5*) |
237 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 236 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
238 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 237 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
239 | # enable_suid_ssh=no | ||
240 | AC_DEFINE(USE_PIPES) | 238 | AC_DEFINE(USE_PIPES) |
241 | ;; | 239 | ;; |
242 | *-*-sysv*) | 240 | *-*-sysv*) |
@@ -2096,25 +2094,6 @@ AC_ARG_WITH(bsd-auth, | |||
2096 | ] | 2094 | ] |
2097 | ) | 2095 | ) |
2098 | 2096 | ||
2099 | AC_MSG_CHECKING(whether to install ssh as suid root) | ||
2100 | AC_ARG_ENABLE(suid-ssh, | ||
2101 | [ --enable-suid-ssh Install ssh as suid root (default) | ||
2102 | --disable-suid-ssh Install ssh without suid bit], | ||
2103 | [ case "$enableval" in | ||
2104 | no) | ||
2105 | AC_MSG_RESULT(no) | ||
2106 | SSHMODE=0711 | ||
2107 | ;; | ||
2108 | *) AC_MSG_RESULT(yes) | ||
2109 | SSHMODE=4711 | ||
2110 | ;; | ||
2111 | esac ], | ||
2112 | AC_MSG_RESULT(yes) | ||
2113 | SSHMODE=4711 | ||
2114 | ) | ||
2115 | AC_SUBST(SSHMODE) | ||
2116 | |||
2117 | |||
2118 | # Where to place sshd.pid | 2097 | # Where to place sshd.pid |
2119 | piddir=/var/run | 2098 | piddir=/var/run |
2120 | # make sure the directory exists | 2099 | # make sure the directory exists |