[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1079-g00913a7

[Volker Lendecke]

The branch, master has been updated
       via  00913a73c7c93f410e5e05a1825138a61705ea6e (commit)
      from  dc0bf17ac130764f3bbdc2d07de4a0fb54a761d2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 00913a73c7c93f410e5e05a1825138a61705ea6e
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Feb 22 19:46:40 2009 +0100

    prefer gssapi header files from subdirectory
    
    this fixes some compile time noise on FreeBSD 7

-----------------------------------------------------------------------

Summary of changes:
 source3/include/includes.h |    6 +++---
 source3/libaddns/dns.h     |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1906830..5ab5564 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -190,12 +190,12 @@ typedef int ber_int_t;
 #undef HAVE_LDAP
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_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
 
 #if HAVE_COM_ERR_H
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h
index 42662a2..57a9b6a 100644
--- a/source3/libaddns/dns.h
+++ b/source3/libaddns/dns.h
@@ -81,12 +81,12 @@
 #include <krb5.h>
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_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
 
 #if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)


-- 
Samba Shared Repository