- (djm) Configure glue for DNS support (code doesn't work in portable yet)

3 files changed, 38 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ec753efe..590a3f6c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
    - markus@cvs.openbsd.org 2003/05/14 22:24:42
      [clientloop.c session.c ssh.1]
      allow to send a BREAK to the remote system; ok various
+ - (djm) Configure glue for DNS support (code doesn't work in portable yet)
 
 20030514
  - (djm) Bug #117: Don't lie to PAM about username
@@ -1488,4 +1489,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2703 2003/05/15 00:20:13 djm Exp $
+$Id: ChangeLog,v 1.2704 2003/05/15 00:53:49 djm Exp $
diff --git a/acconfig.h b/acconfig.h
index 0a4706425..ef43a9d25 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.151 2003/05/10 07:05:46 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.152 2003/05/15 00:53:49 djm Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -380,6 +380,12 @@
 /* Define if cmsg_type is not passed correctly */
 #undef BROKEN_CMSG_TYPE
 
+/* Define if DNS support is to be activated */
+#undef DNS
+
+/* Define if -llwres is to be used */
+#undef LWRES
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.ac b/configure.ac
index 7a24838fe..000fb4bc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.117 2003/05/10 09:28:02 djm Exp $
+# $Id: configure.ac,v 1.118 2003/05/15 00:53:49 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1804,7 +1804,6 @@ if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
 fi
 
 SCARD_MSG="no" 
-
 # Check whether user wants sectok support
 AC_ARG_WITH(sectok,
         [  --with-sectok           Enable smartcard support using libsectok],
@@ -1854,6 +1853,32 @@ if test x$opensc_config_prefix != x ; then
   fi
 fi
 
+# Check whether user wants DNS support
+DNS_MSG="no" 
+AC_ARG_WITH(dns,
+        [  --with-dns              Support for fetching keys from DNS (experimental)],
+        [
+                if test "x$withval" != "xno" ; then
+                        AC_DEFINE(DNS)
+                        DNS_MSG="yes" 
+                fi
+        ]
+)
+
+LWRES_MSG=""
+AC_ARG_WITH(lwres,
+        [  --with-lwres            Use lwres library/headers for DNS support],
+        [
+                if test "x$withval" != "xno" -a "x$DNS_MSG" = "xyes"; then
+                        AC_DEFINE(LWRES)
+                        LWRES_MSG="(using liblwres)" 
+                        AC_SEARCH_LIBS(lwres_herror, lwres)
+                fi
+        ]
+)
+
+
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no" 
 AC_ARG_WITH(kerberos5,
@@ -2578,7 +2603,8 @@ if test ! -z "$superuser_path" ; then
 echo "          sshd superuser user PATH: $J"
 fi
 echo "                    Manpage format: $MANTYPE"
-echo "                       PAM support: ${PAM_MSG}"
+echo "                       DNS support: $DNS_MSG $LWRES_MSG"
+echo "                       PAM support: $PAM_MSG"
 echo "                KerberosIV support: $KRB4_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                 Smartcard support: $SCARD_MSG"