summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-05-08 20:42:28 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-05-08 20:42:28 +0000
commit72af2ef8db31b13b8b51a2a29ed8edf36f3c89fb (patch)
treedc85011c12127c30286433343e71f9b5387f5021
parent97c677d4f04b8f8938c893656f667a29527f4a0f (diff)
- (bal) ./configure support to disable SIA on OSF1. Patch by
Chris Adams <cmadams@hiwaay.net>
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL5
-rw-r--r--configure.in16
3 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 04e41fff2..43c393433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
13 Use addargs() in sftp plus some clean up of addargs(). OK Markus 13 Use addargs() in sftp plus some clean up of addargs(). OK Markus
14 - (bal) UseLogin patch for Solaris/UNICOS. Patch by Wayne Davison 14 - (bal) UseLogin patch for Solaris/UNICOS. Patch by Wayne Davison
15 <wayne@blorf.net> 15 <wayne@blorf.net>
16 - (bal) ./configure support to disable SIA on OSF1. Patch by
17 Chris Adams <cmadams@hiwaay.net>
16 18
1720010508 1920010508
18 - (bal) Fixed configure test for USE_SIA. 20 - (bal) Fixed configure test for USE_SIA.
@@ -5373,4 +5375,4 @@
5373 - Wrote replacements for strlcpy and mkdtemp 5375 - Wrote replacements for strlcpy and mkdtemp
5374 - Released 1.0pre1 5376 - Released 1.0pre1
5375 5377
5376$Id: ChangeLog,v 1.1209 2001/05/08 20:33:05 mouring Exp $ 5378$Id: ChangeLog,v 1.1210 2001/05/08 20:42:28 mouring Exp $
diff --git a/INSTALL b/INSTALL
index 3fa9378b1..315bab681 100644
--- a/INSTALL
+++ b/INSTALL
@@ -140,6 +140,9 @@ it if lastlog is installed in a different place.
140 140
141--without-lastlog will disable lastlog support entirely. 141--without-lastlog will disable lastlog support entirely.
142 142
143--with-sia, --without-sia will enable or disable OSF1's Security
144Integration Architecture. The default for OSF1 machines is enable.
145
143--with-kerberos4=PATH will enable Kerberos IV support. You will need 146--with-kerberos4=PATH will enable Kerberos IV support. You will need
144to have the Kerberos libraries and header files installed for this 147to have the Kerberos libraries and header files installed for this
145to work. Use the optional PATH argument to specify the root of your 148to work. Use the optional PATH argument to specify the root of your
@@ -227,4 +230,4 @@ Please refer to the "reporting bugs" section of the webpage at
227http://www.openssh.com/ 230http://www.openssh.com/
228 231
229 232
230$Id: INSTALL,v 1.44 2001/04/28 16:32:11 mouring Exp $ 233$Id: INSTALL,v 1.45 2001/05/08 20:42:28 mouring Exp $
diff --git a/configure.in b/configure.in
index 4b1362a90..eb00a93a6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.284 2001/05/08 20:33:06 mouring Exp $ 1# $Id: configure.in,v 1.285 2001/05/08 20:42:28 mouring Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -239,8 +239,18 @@ mips-sony-bsd|mips-sony-newsos4)
239 MANTYPE=man 239 MANTYPE=man
240 ;; 240 ;;
241*-dec-osf*) 241*-dec-osf*)
242 if test ! -z "$USE_SIA" ; then 242 AC_MSG_CHECKING(for Digital Unix SIA)
243 AC_MSG_CHECKING(for Digital Unix Security Integration Architecture) 243 no_osfsia=""
244 AC_ARG_WITH(osfsia,
245 [ --with-osfsia Enable Digital Unix SIA],
246 [
247 if test "x$withval" = "xno" ; then
248 AC_MSG_RESULT(disabled)
249 no_osfsia=1
250 fi
251 ],
252 )
253 if test -z "$no_osfsia" ; then
244 if test -f /etc/sia/matrix.conf; then 254 if test -f /etc/sia/matrix.conf; then
245 AC_MSG_RESULT(yes) 255 AC_MSG_RESULT(yes)
246 AC_DEFINE(HAVE_OSF_SIA) 256 AC_DEFINE(HAVE_OSF_SIA)