summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-05-18 11:50:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:53 -0500
commit2a01014f8feed4c4b89bc9c92d48ce2a6ae16405 (patch)
tree69e1247102349ee2743d167f1410b931a54933e8
parente87dd1091ac7abc6d733b87dabde2a71cdb16253 (diff)
downloadsamba-2a01014f8feed4c4b89bc9c92d48ce2a6ae16405.tar.gz
samba-2a01014f8feed4c4b89bc9c92d48ce2a6ae16405.tar.bz2
samba-2a01014f8feed4c4b89bc9c92d48ce2a6ae16405.zip
r6879: Another attempt at including the 'right' kerberos headers on
dual-install systems. Andrew Bartlett (This used to be commit efc24f1a4592270634dca253689c1b54e154d8b8)
-rw-r--r--source4/include/system/kerberos.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h
index 28ff260438..e0a926300f 100644
--- a/source4/include/system/kerberos.h
+++ b/source4/include/system/kerberos.h
@@ -28,17 +28,20 @@
#endif
#if defined(HAVE_GSSAPI_H)
-#include <gssapi.h>
+# include <gssapi.h>
+# ifdef HAVE_GSSAPI_KRB5_H
+# include <gssapi_krb5.h>
+# endif
#elif defined(HAVE_GSSAPI_GSSAPI_H)
-#include <gssapi/gssapi.h>
+# include <gssapi/gssapi.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+# include <gssapi/gssapi_krb5.h>
+# endif
#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-#include <gssapi/gssapi_generic.h>
-#endif
-
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
-#include <gssapi/gssapi_krb5.h>
+# include <gssapi/gssapi_generic.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+# include <gssapi/gssapi_krb5.h>
+# endif
#endif
#ifdef HAVE_COM_ERR_H