doveadm: doveadm-auth - Add GSSAPI support for login test

This only applies when GSSAPI support is built in.

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index dfdea3ff3a606eb657b1f60c472146a39bf4d64e..f4c8434ceba0e21e2fe4897aa43639d683d7dfc7 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -45,9 +45,18 @@ libs = \
        ../lib-auth/libauth-crypt.la \
        dsync/libdsync.la \
        ../lib-compression/libcompression.la
+gssapi_libs =
+gssapi_deps =
+if HAVE_GSSAPI
+if !GSSAPI_PLUGIN
+gssapi_libs += $(LIBDOVECOT_GSSAPI)
+gssapi_deps += $(LIBDOVECOT_GSSAPI_DEPS)
+endif
+endif
 
 doveadm_LDADD = \
        $(libs) \
+       $(gssapi_libs) \
        $(CRYPT_LIBS) \
        $(LIBDOVECOT_STORAGE) \
        $(LIBDOVECOT) \
@@ -57,11 +66,13 @@ doveadm_LDADD = \
 
 doveadm_DEPENDENCIES = \
        $(libs) \
+       $(gssapi_deps) \
        $(LIBDOVECOT_STORAGE_DEPS) \
        $(LIBDOVECOT_DEPS)
 
 doveadm_server_LDADD = \
        $(libs) \
+       $(gssapi_libs) \
        $(LIBDOVECOT_STORAGE) \
        $(LIBDOVECOT) \
        $(BINARY_LDFLAGS) \
@@ -69,6 +80,7 @@ doveadm_server_LDADD = \
 
 doveadm_server_DEPENDENCIES = \
        $(libs) \
+       $(gssapi_deps) \
        $(LIBDOVECOT_STORAGE_DEPS) \
        $(LIBDOVECOT_DEPS)
 

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index e4cafac42930a05d0f84c929ec6ba79b78f4471e..23b8ff347fc17b7b455f7bcaeaf38c5d225d6555 100644 (file)
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -503,6 +503,9 @@ static void cmd_auth_cache_flush(struct doveadm_cmd_context *cctx)
 static void authtest_input_init(struct authtest_input *input)
 {
        dsasl_clients_init();
+#ifdef BUILTIN_GSSAPI
+       dsasl_clients_init_gssapi();
+#endif
 
        i_zero(input);
        input->pool = pool_alloconly_create("auth input", 256);