dovecot-1.1: gssapi: Check for gssapi_krb5.h existence before tr...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/280e570a5ced
changeset: 7610:280e570a5ced
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jun 04 20:32:33 2008 +0300
description:
gssapi: Check for gssapi_krb5.h existence before trying to use it.

diffstat:

2 files changed, 9 insertions(+), 9 deletions(-)
configure.in           |    4 +---
src/auth/mech-gssapi.c |   14 ++++++++------

diffs (46 lines):

diff -r c008dde3c973 -r 280e570a5ced configure.in
--- a/configure.in	Wed Jun 04 20:23:05 2008 +0300
+++ b/configure.in	Wed Jun 04 20:32:33 2008 +0300
@@ -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 -r c008dde3c973 -r 280e570a5ced src/auth/mech-gssapi.c
--- a/src/auth/mech-gssapi.c	Wed Jun 04 20:23:05 2008 +0300
+++ b/src/auth/mech-gssapi.c	Wed Jun 04 20:32:33 2008 +0300
@@ -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