From: Timo Sirainen <tss@iki.fi>
Date: Wed, 4 Jun 2008 17:32:33 +0000 (+0300)
Subject: gssapi: Check for gssapi_krb5.h existence before trying to use it.
X-Git-Tag: 1.2.alpha1~363^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01ff322068d8cb54d37b478efc1348087b1f9f78;p=thirdparty%2Fdovecot%2Fcore.git

gssapi: Check for gssapi_krb5.h existence before trying to use it.

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index 3c06aa7ab9..52a4fb922f 100644
--- a/configure.in
+++ b/configure.in
@@ -1664,15 +1664,13 @@ if test $want_gssapi != no; then
 				AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,, GSSAPI headers in gssapi/gssapi.h)
 				have_gssapi=yes
 			])
-			AC_CHECK_HEADER([gssapi/gssapi_ext.h], [
-				AC_DEFINE(HAVE_GSSAPI_GSSAPI_EXT_H,, GSSAPI headers in gssapi/gssapi_ext.h)
-			])
 			AC_CHECK_HEADER([gssapi.h], [
 				AC_DEFINE(HAVE_GSSAPI_H,, GSSAPI headers in gssapi.h)
 				have_gssapi=yes
 			])
 			if test $have_gssapi = yes; then
 				AC_DEFINE(HAVE_GSSAPI,, Build with GSSAPI support)
+				AC_CHECK_HEADERS(gssapi/gssapi_ext.h gssapi_krb5.h gssapi/gssapi_krb5.h)
 				AC_CHECK_LIB(gss, __gss_userok, [
 					AC_DEFINE(HAVE___GSS_USEROK,,
 						Define if you have __gss_userok())
diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c
index 422c3e5cba..06eb7ec311 100644
--- a/src/auth/mech-gssapi.c
+++ b/src/auth/mech-gssapi.c
@@ -30,14 +30,16 @@
 
 #ifdef HAVE_GSSAPI_GSSAPI_H
 #  include <gssapi/gssapi.h>
-#  ifdef USE_KRB5_USEROK
-#    include <gssapi/gssapi_krb5.h>
-#  endif
 #elif defined (HAVE_GSSAPI_H)
 #  include <gssapi.h>
-#  ifdef USE_KRB5_USEROK
-#    include <gssapi_krb5.h>
-#  endif
+#endif
+
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+#  include <gssapi/gssapi_krb5.h>
+#elif defined (HAVE_GSSAPI_KRB5_H)
+#  include <gssapi_krb5.h>
+#else
+#  undef USE_KRB5_USEROK
 #endif
 
 #ifdef HAVE_GSSAPI_GSSAPI_EXT_H