More Heimdal changes. Still not compiling with Heimdal yet...

Jeremy.
(This used to be commit c3544c119e4cafb817479b4c5dfae178c3de000b)

diff --git a/source3/configure b/source3/configure
index 016604526b314158330e90159318c52d38d80b9b..86d4f6d28e03f394c3a93f087114165b2cdfd948 100755 (executable)
--- a/source3/configure
+++ b/source3/configure
@@ -12301,7 +12301,7 @@ done
 
   # now check for gssapi headers.  This is also done here to allow for
   # different kerberos include paths
-  for ac_hdr in gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h
+  for ac_hdr in gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/source3/configure.in b/source3/configure.in
index ad778bf88daaee7f069218a675efcd62e2cdc93b..ee94c89b4019ad9eb043c35ae951e6f58a77e2fd 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2032,7 +2032,7 @@ fi
 
   # now check for gssapi headers.  This is also done here to allow for
   # different kerberos include paths
-  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h)
+  AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h)
 
   ##################################################################
   # we might need the k5crypto and com_err libraries on some systems

diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 6d1890b0bdfca98c2b5570d5abb9d68b265a5cbd..f68452236658ef8fd1af278ec99136660f0f573f 100644 (file)
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -875,6 +875,9 @@
 /* Define if you have the <arpa/inet.h> header file.  */
 #undef HAVE_ARPA_INET_H
 
+/* Define if you have the <com_err.h> header file.  */
+#undef HAVE_COM_ERR_H
+
 /* Define if you have the <compat.h> header file.  */
 #undef HAVE_COMPAT_H
 

diff --git a/source3/include/includes.h b/source3/include/includes.h
index add8ba91d8beac370c14a38b68614b16f77dcc0e..eb89d6f2af430225562849292fa2bc42a10e6c23 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -424,6 +424,10 @@
 #include <gssapi/gssapi_generic.h>
 #endif
 
+#if HAVE_COM_ERR_H
+#include <com_err.h>
+#endif
+
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS