- Added autoconf option to enable Kerberos 4 support (untested)

 - Added autoconf option to enable AFS support (untested)
 - Added autoconf option to enable S/Key support (untested)
 - Added autoconf option to enable TCP wrappers support (compiles OK)

diff --git a/ChangeLog b/ChangeLog
index 657842b542b06d8e461ce2f23c0f4b08c6c23be4..6b02ba1a8e6df1f546a9a463e51c897f0d95f3ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
 19991119
  - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com>
-   (off-by-one error - doesn't appear to be easily exploitable)
  - Merged OpenBSD CVS changes
    - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c]
      more %d vs. %s in fmt-strings
@@ -11,6 +10,10 @@
  - Fix scp progress bar bug again.
  - Move scp from ${libdir}/ssh to ${libexecdir}/ssh at request of 
    David Rankin <drankin@bohemians.lexington.ky.us>
+ - Added autoconf option to enable Kerberos 4 support (untested)
+ - Added autoconf option to enable AFS support (untested)
+ - Added autoconf option to enable S/Key support (untested)
+ - Added autoconf option to enable TCP wrappers support (compiles OK)
 
 19991118
  - Merged OpenBSD CVS changes

diff --git a/Makefile.in b/Makefile.in
index 73c4db766eb6abfac15418974b275bb7d95f1c8d..4daa810ec146dc6dc0a954450ef6fecca7988a25 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,10 +22,10 @@ GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
 GNOME_LIBS=`gnome-config --libs gnome gnomeui`
 
 OBJS=  authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \
-               auth-rsa.o bufaux.o buffer.o canohost.o channels.o cipher.o \
-               clientloop.o compress.o crc32.o deattack.o helper.o hostfile.o \
-               log-client.o login.o log-server.o match.o mpaux.o packet.o pty.o \
-               readconf.o readpass.o rsa.o servconf.o serverloop.o \
+               auth-rsa.o auth-skey.o bufaux.o buffer.o canohost.o channels.o \
+               cipher.o clientloop.o compress.o crc32.o deattack.o helper.o \
+               hostfile.o log-client.o login.o log-server.o match.o mpaux.o \
+               packet.o pty.o readconf.o readpass.o rsa.o servconf.o serverloop.o \
                sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \
                helper.o mktemp.o strlcpy.o rc4.o
 

diff --git a/acconfig.h b/acconfig.h
index 05296f9badc57f7bfc002c95f1aa4a9c44b97d4e..44c5c1a14fd7cb0161366c21aa4660628d3ebf55 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,6 +30,18 @@
 /* Define if libc defines __progname */
 #undef HAVE___PROGNAME
 
+/* Define if you want Kerberos 4 support */
+#undef KRB4
+
+/* Define if you want AFS support */
+#undef AFS
+
+/* Define if you want S/Key support */
+#undef SKEY
+
+/* Define if you want TCP Wrappers support */
+#undef LIBWRAP
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */

diff --git a/auth-skey.c b/auth-skey.c
index 06f81b89571c9359a0cd03b8151bab2e57ca80bb..91bdda8f2e296997c2daff0dde2c87f9f162f789 100644 (file)
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,3 +1,5 @@
+#ifdef SKEY
+
 #include "includes.h"
 RCSID("$Id$");
 
@@ -147,3 +149,5 @@ skey_fake_keyinfo(char *username)
        }
        return skeyprompt;
 }
+
+#endif SKEY

diff --git a/configure.in b/configure.in
index 05a354d1ab6b50ebca729972a868305c1cce1173..0b54fd58a560dd89f123157d05a5eabd6979ac60 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -166,4 +166,41 @@ AC_TRY_LINK([],
        ]
 )
 
+dnl Check whether user wants Kerberos support
+AC_ARG_WITH(kerberos4,
+       [  --with-kerberos4        Enable Kerberos 4 support],
+       [
+               AC_DEFINE(KRB4)
+               LIBS="$LIBS -lkrb"
+               CFLAGS="$CFLAGS -I/usr/include/kerberosIV"
+       ]
+)
+
+dnl Check whether user wants AFS support
+AC_ARG_WITH(kerberos4,
+       [  --with-afs              Enable AFS support],
+       [
+               AC_DEFINE(AFS)
+               LIBS="$LIBS -lkafs"
+       ]
+)
+
+dnl Check whether user wants S/Key support
+AC_ARG_WITH(skey,
+       [  --with-skey             Enable S/Key support],
+       [
+               AC_DEFINE(SKEY)
+               LIBS="$LIBS -lskey"
+       ]
+)
+
+dnl Check whether user wants TCP wrappers support
+AC_ARG_WITH(skey,
+       [  --with-tcp-wrappers     Enable tcpwrappers support],
+       [
+               AC_DEFINE(LIBWRAP)
+               LIBS="$LIBS -lwrap"
+       ]
+)
+
 AC_OUTPUT(Makefile)