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 @@
      Use addargs() in sftp plus some clean up of addargs().  OK Markus
  - (bal) UseLogin patch for Solaris/UNICOS.  Patch by Wayne Davison 
    <wayne@blorf.net>
+ - (bal) ./configure support to disable SIA on OSF1.  Patch by
+   Chris Adams <cmadams@hiwaay.net>
 
 20010508
  - (bal) Fixed configure test for USE_SIA.  
@@ -5373,4 +5375,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1209 2001/05/08 20:33:05 mouring Exp $
+$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.
 
 --without-lastlog will disable lastlog support entirely.
 
+--with-sia, --without-sia will enable or disable OSF1's Security 
+Integration Architecture.  The default for OSF1 machines is enable.
+
 --with-kerberos4=PATH will enable Kerberos IV support. You will need
 to have the Kerberos libraries and header files installed for this
 to 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
 http://www.openssh.com/
 
 
-$Id: INSTALL,v 1.44 2001/04/28 16:32:11 mouring Exp $
+$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 @@
-# $Id: configure.in,v 1.284 2001/05/08 20:33:06 mouring Exp $
+# $Id: configure.in,v 1.285 2001/05/08 20:42:28 mouring Exp $
 
 AC_INIT(ssh.c)
 
@@ -239,8 +239,18 @@ mips-sony-bsd|mips-sony-newsos4)
         MANTYPE=man
         ;;
 *-dec-osf*)
-        if test ! -z "$USE_SIA" ; then
-                AC_MSG_CHECKING(for Digital Unix Security Integration Architecture)
+        AC_MSG_CHECKING(for Digital Unix SIA)
+        no_osfsia=""
+        AC_ARG_WITH(osfsia,
+                [  --with-osfsia           Enable Digital Unix SIA],
+                [
+                        if test "x$withval" = "xno" ; then
+                                AC_MSG_RESULT(disabled)
+                                no_osfsia=1
+                        fi
+                ],
+        )
+        if test -z "$no_osfsia" ; then
                 if test -f /etc/sia/matrix.conf; then
                         AC_MSG_RESULT(yes)
                         AC_DEFINE(HAVE_OSF_SIA)