diff options
| author | Günther Deschner <gd@samba.org> | 2011-03-02 14:03:30 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-03-16 10:11:16 +0100 |
| commit | d19ea55e9e48ccb1ca63bfc0ec97f0ba7b26f7fd (patch) | |
| tree | cc090740800525471de40f7dbde9bfb08b2c54ab | |
| parent | 6c8d802391e0aaf375108bcd1270565983d735a8 (diff) | |
| download | samba-d19ea55e9e48ccb1ca63bfc0ec97f0ba7b26f7fd.tar.gz samba-d19ea55e9e48ccb1ca63bfc0ec97f0ba7b26f7fd.tar.bz2 samba-d19ea55e9e48ccb1ca63bfc0ec97f0ba7b26f7fd.zip | |
s3-includes: avoid global include of gssapi headers.
Guenther
| -rw-r--r-- | source3/include/includes.h | 12 | ||||
| -rw-r--r-- | source3/include/smb_krb5.h | 12 | ||||
| -rw-r--r-- | source3/libsmb/errormap.c | 8 |
3 files changed, 20 insertions, 12 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index c79c96260a..41483525fa 100644 --- 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 64c5136acb..adbb0debc3 100644 --- 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 71efff37a5..049929f74b 100644 --- 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' |