From 867ec136becaac97b0d034c6c5332a9325daf17b Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Tue, 7 Oct 2025 17:48:22 +0200 Subject: [PATCH] lib-sasl: sasl-server-mech-gssapi - Move GSSAPI includes to lib-auth/auth-gssapi.h --- src/lib-auth/Makefile.am | 1 + src/lib-auth/auth-gssapi.h | 20 ++++++++++++++++++++ src/lib-sasl/sasl-server-mech-gssapi.c | 17 +---------------- 3 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 src/lib-auth/auth-gssapi.h diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am index 3b94f72155..817afd21d8 100644 --- a/src/lib-auth/Makefile.am +++ b/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 \ diff --git a/src/lib-auth/auth-gssapi.h b/src/lib-auth/auth-gssapi.h new file mode 100644 index 0000000000..9c55999725 --- /dev/null +++ b/src/lib-auth/auth-gssapi.h @@ -0,0 +1,20 @@ +#ifndef AUTH_GSSAPI_H +#define AUTH_GSSAPI_H + +#ifdef HAVE_GSSAPI_GSSAPI_H +# include +#elif defined (HAVE_GSSAPI_H) +# include +#endif + +#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H +# include +#elif defined (HAVE_GSSAPI_KRB5_H) +# include +#endif + +#ifdef HAVE_GSSAPI_GSSAPI_EXT_H +# include +#endif + +#endif diff --git a/src/lib-sasl/sasl-server-mech-gssapi.c b/src/lib-sasl/sasl-server-mech-gssapi.c index 105b0b8472..204675712a 100644 --- a/src/lib-sasl/sasl-server-mech-gssapi.c +++ b/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 -#elif defined (HAVE_GSSAPI_H) -# include -#endif - -#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H -# include -#elif defined (HAVE_GSSAPI_KRB5_H) -# include -#endif - -#ifdef HAVE_GSSAPI_GSSAPI_EXT_H -# include -#endif - #define krb5_boolean2bool(X) ((X) != 0) /* Non-zero flags defined in RFC 2222 */ -- 2.47.3