5 files changed, 19 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 650d611dd..da3331b36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
    - markus@cvs.openbsd.org 2003/10/14 19:54:39
      [session.c ssh-agent.c]
      10X for mkdtemp; djm@
+ - (dtucker) [acconfig.h configure.ac dns.c openbsd-compat/getrrsetbyname.c
+   openbsd-compat/getrrsetbyname.h] DNS fingerprint support is now always
+   compiled in but disabled in config.
 
 20031009
  - (dtucker) [sshd_config.5] UsePAM defaults to "no".  ok djm@
@@ -1356,4 +1359,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3079 2003/10/15 06:10:25 dtucker Exp $
+$Id: ChangeLog,v 1.3080 2003/10/15 06:57:57 dtucker Exp $
diff --git a/acconfig.h b/acconfig.h
index d0897d6b6..80907f0dc 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.167 2003/09/19 11:25:24 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.168 2003/10/15 06:57:57 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -418,9 +418,6 @@
 #undef LOCKED_PASSWD_PREFIX
 #undef LOCKED_PASSWD_SUBSTR
 
-/* Define if DNS support is to be activated */
-#undef DNS
-
 /* Define if getrrsetbyname() exists */
 #undef HAVE_GETRRSETBYNAME
 
diff --git a/configure.ac b/configure.ac
index 44808f7e5..3d230a6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.172 2003/10/07 10:35:57 dtucker Exp $
+# $Id: configure.ac,v 1.173 2003/10/15 06:57:57 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1961,28 +1961,18 @@ 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)],
+# Check libraries needed by DNS fingerprint support
+AC_SEARCH_LIBS(getrrsetbyname, resolv, 
+        [AC_DEFINE(HAVE_GETRRSETBYNAME)],
         [
-                if test "x$withval" != "xno" ; then
-                        DNS_MSG="yes"
-                        AC_DEFINE(DNS)
-                        AC_SEARCH_LIBS(getrrsetbyname, resolv, 
-                                [AC_DEFINE(HAVE_GETRRSETBYNAME)],
-                                [
-                                        # Needed by our getrrsetbyname()
-                                        AC_SEARCH_LIBS(res_query, resolv)
-                                        AC_SEARCH_LIBS(dn_expand, resolv)
-                                        AC_CHECK_FUNCS(_getshort _getlong)
-                                        AC_CHECK_MEMBER(HEADER.ad,
-                                                [AC_DEFINE(HAVE_HEADER_AD)],,
-                                                [#include <arpa/nameser.h>])
-                                ])
-                fi
-        ]
-)
+                # Needed by our getrrsetbyname()
+                AC_SEARCH_LIBS(res_query, resolv)
+                AC_SEARCH_LIBS(dn_expand, resolv)
+                AC_CHECK_FUNCS(_getshort _getlong)
+                AC_CHECK_MEMBER(HEADER.ad,
+                        [AC_DEFINE(HAVE_HEADER_AD)],,
+                        [#include <arpa/nameser.h>])
+        ])
 
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no" 
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 44fa2755b..1478654d8 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -45,7 +45,7 @@
 
 #include "includes.h"
 
-#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
+#ifndef HAVE_GETRRSETBYNAME
 
 #include "getrrsetbyname.h"
 
diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 6466a54d6..bdc6a4d3a 100644
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -48,7 +48,7 @@
 
 #include "includes.h"
 
-#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
+#ifndef HAVE_GETRRSETBYNAME
 
 #include <sys/types.h>
 #include <netinet/in.h>