[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5009-g1bfdbb0

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  1bfdbb093f7c5e434ea3e653d389e1ccec578af6 (commit)
      from  4f4a15f4c1f4f2f72f3f651b102938c48ac7ab5b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 1bfdbb093f7c5e434ea3e653d389e1ccec578af6
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:
 source/include/includes.h |    6 +++---
 source/libaddns/dns.h     |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/includes.h b/source/include/includes.h
index d95b821..7b24b72 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -207,12 +207,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/source/libaddns/dns.h b/source/libaddns/dns.h
index 2eaeaf7..9f6e7e9 100644
--- a/source/libaddns/dns.h
+++ b/source/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