summaryrefslogtreecommitdiffstats
path: root/source/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-05-18 11:50:09 +0000
committerAndrew Bartlett <abartlet@samba.org>2005-05-18 11:50:09 +0000
commitaa47589476b7bb8bc974ad9cbc30b1f627c83f3e (patch)
treebcc84baa7bdac3251fe2194e00323b91aabc15ef /source/include
parent1235bc18e3ec2c0badeeec8b1966dbbb4467f1da (diff)
downloadsamba-aa47589476b7bb8bc974ad9cbc30b1f627c83f3e.tar.gz
samba-aa47589476b7bb8bc974ad9cbc30b1f627c83f3e.tar.xz
samba-aa47589476b7bb8bc974ad9cbc30b1f627c83f3e.zip
r6879: Another attempt at including the 'right' kerberos headers on
dual-install systems. Andrew Bartlett
Diffstat (limited to 'source/include')
-rw-r--r--source/include/system/kerberos.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/source/include/system/kerberos.h b/source/include/system/kerberos.h
index 28ff260438b..e0a926300ff 100644
--- a/source/include/system/kerberos.h
+++ b/source/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