lib-sasl: sasl-server-mech-gssapi - Move GSSAPI includes to lib-auth/auth-gssapi.h

src/lib-auth/Makefile.am

@@ -32,6 +32,7 @@ headers = \
 	mycrypt.h \
 	auth-digest.h \
 	auth-gs2.h \
+	auth-gssapi.h \
 	auth-scram.h \
 	auth-scram-client.h \
 	auth-scram-server.h \

src/lib-auth/auth-gssapi.h

@@ -0,0 +1,20 @@
+#ifndef AUTH_GSSAPI_H
+#define AUTH_GSSAPI_H
+
+#ifdef HAVE_GSSAPI_GSSAPI_H
+#  include <gssapi/gssapi.h>
+#elif defined (HAVE_GSSAPI_H)
+#  include <gssapi.h>
+#endif
+
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+#  include <gssapi/gssapi_krb5.h>
+#elif defined (HAVE_GSSAPI_KRB5_H)
+#  include <gssapi_krb5.h>
+#endif
+
+#ifdef HAVE_GSSAPI_GSSAPI_EXT_H
+#  include <gssapi/gssapi_ext.h>
+#endif
+
+#endif

src/lib-sasl/sasl-server-mech-gssapi.c

@@ -18,26 +18,11 @@
 #include "str-sanitize.h"
 #include "hex-binary.h"
 #include "safe-memset.h"
+#include "auth-gssapi.h"
 
 #include "sasl-server-protected.h"
 #include "sasl-server-gssapi.h"
 
-#ifdef HAVE_GSSAPI_GSSAPI_H
-#  include <gssapi/gssapi.h>
-#elif defined (HAVE_GSSAPI_H)
-#  include <gssapi.h>
-#endif
-
-#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
-#  include <gssapi/gssapi_krb5.h>
-#elif defined (HAVE_GSSAPI_KRB5_H)
-#  include <gssapi_krb5.h>
-#endif
-
-#ifdef HAVE_GSSAPI_GSSAPI_EXT_H
-#  include <gssapi/gssapi_ext.h>
-#endif
-
 #define krb5_boolean2bool(X) ((X) != 0)
 
 /* Non-zero flags defined in RFC 2222 */