pullup from trunk

ticket: 2906
version_fixed: 1.4.1

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 469bdacf3f412a33c6f549ecf73745255eb7cfbd..5aa3eb73cf26d9292b75378d98f80e3cb273d6a0 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Tom Yu  <tlyu@mit.edu>
+
+       * dnsglue.h: Define ns_rr_class to ns_rr_cl if ns_rr_class doesn't
+       exist.
+
 2005-01-12  Tom Yu  <tlyu@mit.edu>
 
        * dnsglue.c (krb5int_dns_fini): Reorder to make more correct.

diff --git a/src/lib/krb5/os/dnsglue.h b/src/lib/krb5/os/dnsglue.h
index d2d192701f425ea3ec89434eb27f0a355a9245a3..9fa293c83a8f43c8396c3b8fb4491e3864c36630 100644 (file)
--- a/src/lib/krb5/os/dnsglue.h
+++ b/src/lib/krb5/os/dnsglue.h
@@ -80,6 +80,15 @@
 
 #endif
 
+#if HAVE_NS_INITPARSE
+/*
+ * Solaris 7 has ns_rr_cl rather than ns_rr_class.
+ */
+#if !defined(ns_rr_class) && defined(ns_rr_cl)
+#define ns_rr_class ns_rr_cl
+#endif
+#endif
+
 #if HAVE_RES_NSEARCH
 /*
  * Some BIND 8 / BIND 9 implementations disable the BIND 4 style