pullup from trunk

ticket: 2793
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16917 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index be64fbe79533a523257c682368378498139c4911..9c1fd0b71da8c30d13966e0f188abdeb54a77f78 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-06  Tom Yu  <tlyu@mit.edu>
+
+       * locate_kdc.c (krb5_locate_srv_dns_1): Don't compile if
+       KRB5_DNS_LOOKUP is not defined.
+
 2004-11-19  Ken Raeburn  <raeburn@mit.edu>
 
        * locate_kdc.c (krb5int_add_host_to_list): If debugging, log the

diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index dfc45cd2324cdb6fb9ee453e87eaa91d579a9918..1fafbcaa9a510da4f4ae3291a8444947d54a5134 100644 (file)
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -503,6 +503,7 @@ krb5_locate_srv_conf(krb5_context context, const krb5_data *realm,
 }
 #endif
 
+#ifdef KRB5_DNS_LOOKUP
 static krb5_error_code
 krb5_locate_srv_dns_1 (const krb5_data *realm,
                       const char *service,
@@ -557,6 +558,7 @@ krb5_locate_srv_dns_1 (const krb5_data *realm,
     krb5int_free_srv_dns_data(head);
     return code;
 }
+#endif
 
 /*
  * Wrapper function for the two backends