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

[Karolin Seeger]

The branch, v3-2-test has been updated
       via  de96e1a82d6e92c00a0ab3020db8d7c0284aadb1 (commit)
      from  bc53054616d442b1b28086181d81776f1c33834f (commit)

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


- Log -----------------------------------------------------------------
commit de96e1a82d6e92c00a0ab3020db8d7c0284aadb1
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
    (cherry picked from commit 1bfdbb093f7c5e434ea3e653d389e1ccec578af6)

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

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 c5dfa24..ccdb886 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 cf842f4..c916ba3 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