s3-includes: avoid global include of gssapi headers.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index c79c96260a420133955ca24c31fa78fb5b0af5b5..41483525fa315809dc5c57ec8fe1e2eaf3e482a6 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -178,18 +178,6 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
 #undef HAVE_LDAP
 #endif
 
-#if HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#elif HAVE_GSSAPI_H
-#include <gssapi.h>
-#endif
-
-#if HAVE_COM_ERR_H
-#include <com_err.h>
-#endif
-
 #if HAVE_SYS_ATTRIBUTES_H
 #include <sys/attributes.h>
 #endif

diff --git a/source3/include/smb_krb5.h b/source3/include/smb_krb5.h
index 64c5136acb0d5991b70c2a274292617b0e603663..adbb0debc38dc0a33c26984855b875f35ce1c5cf 100644 (file)
--- a/source3/include/smb_krb5.h
+++ b/source3/include/smb_krb5.h
@@ -14,6 +14,18 @@
 #include <krb5.h>
 #endif
 
+#if HAVE_GSSAPI_GSSAPI_H
+#include <gssapi/gssapi.h>
+#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
+#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
+#endif
+
+#if HAVE_COM_ERR_H
+#include <com_err.h>
+#endif
+
 #ifndef KRB5_ADDR_NETBIOS
 #define KRB5_ADDR_NETBIOS 0x14
 #endif

diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c
index 71efff37a5f7420ff8f199e0aaee175d6ec5f56a..049929f74bc8d90cd2a606f37ef70ff9b91b01ca 100644 (file)
--- a/source3/libsmb/errormap.c
+++ b/source3/libsmb/errormap.c
@@ -22,6 +22,14 @@
 #include "includes.h"
 #include "nsswitch/libwbclient/wbclient.h"
 
+#if HAVE_GSSAPI_GSSAPI_H
+#include <gssapi/gssapi.h>
+#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
+#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
+#endif
+
 /* This map was extracted by the ERRMAPEXTRACT smbtorture command. 
    The setup was a Samba HEAD (2002-01-03) PDC and an Win2k member 
    workstation.  The PDC was modified (by using the 'name_to_nt_status'