svn commit: samba r6811 - in branches/SAMBA_4_0/source/include/system: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-05-16 03:30:18 +0000 (Mon, 16 May 2005)
New Revision: 6811

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6811

Log:
Another attempt at better kerberos/gssapi headers.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/system/kerberos.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/system/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/include/system/kerberos.h	2005-05-16 03:17:54 UTC (rev 6810)
+++ branches/SAMBA_4_0/source/include/system/kerberos.h	2005-05-16 03:30:18 UTC (rev 6811)
@@ -27,11 +27,7 @@
 #undef HAVE_KRB5
 #endif
 
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
-#include <gssapi/gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_H)
+#if defined(HAVE_GSSAPI_H)
 #include <gssapi.h>
 #elif defined(HAVE_GSSAPI_GSSAPI_H)
 #include <gssapi/gssapi.h>
@@ -39,6 +35,12 @@
 #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>
+#endif
+
 #ifdef HAVE_COM_ERR_H
 #include <com_err.h>
 #endif