Fix build without KRB5_DNS_LOOKUP

Define MAX_DNS_NAMELEN unconditionally in k5-int.h as we use it
unconditionally in kdc_util.c.  Don't define it in locate_kdc.c.

Conditionalize dns_locate_server() in locate_kdc.c as its only call
site (in k5_locate_server) and its helper function (locate_srv_dns_1)
are conditional.

From Chris Hecker with minor changes.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25042 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index a4ac496c2195fa76dde1157f1b52587a7a9f5216..2ca649ee7409ba293eb4b9ea253bad7ea0b6ed5d 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -2094,10 +2094,10 @@ struct srv_dns_entry {
     unsigned short port;
     char *host;
 };
-#ifdef KRB5_DNS_LOOKUP
 
 #define MAX_DNS_NAMELEN (15*(MAXHOSTNAMELEN + 1)+1)
 
+#ifdef KRB5_DNS_LOOKUP
 krb5_error_code
 krb5int_make_srv_query_realm(const krb5_data *realm,
                              const char *service,

diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index c2ae0fadb8ea69140aee33bd144822ed5aa93665..8bcfb267825f541d04334dd87acc0d6d6a436857 100644 (file)
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -47,8 +47,6 @@
 #define MAXHOSTNAMELEN 64
 #endif
 
-#define MAX_DNS_NAMELEN (15*(MAXHOSTNAMELEN + 1)+1)
-
 #if KRB5_DNS_LOOKUP_KDC
 #define DEFAULT_LOOKUP_KDC 1
 #else
@@ -520,6 +518,7 @@ prof_locate_server(krb5_context context, const krb5_data *realm,
                              dflport1, dflport2);
 }
 
+#ifdef KRB5_DNS_LOOKUP
 static krb5_error_code
 dns_locate_server(krb5_context context, const krb5_data *realm,
                   struct serverlist *serverlist, enum locate_service_type svc,
@@ -565,6 +564,7 @@ dns_locate_server(krb5_context context, const krb5_data *realm,
     }
     return code;
 }
+#endif /* KRB5_DNS_LOOKUP */
 
 /*
  * Wrapper function for the various backends