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

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index 3c06aa7ab940890224072a4c2993304fcbeb8a94..52a4fb922f74b62f98d98c2e6a82dd2481c22735 100644 (file)
--- 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 422c3e5cba2296ddf3fb198be5b611271dfbf6dd..06eb7ec311b350f1cb039246670d3dbb86544cc8 100644 (file)
--- 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