lib-sasl: sasl-server - Merge sasl-server-mech-plain-common into sasl-server-mech

diff --git a/src/lib-sasl/Makefile.am b/src/lib-sasl/Makefile.am
index 688239a219718d3e52f98e5a3f307b5b8a857b88..86f9e6e52141038e98a2319da060af862589d8de 100644 (file)
--- a/src/lib-sasl/Makefile.am
+++ b/src/lib-sasl/Makefile.am
@@ -30,7 +30,6 @@ server_mechanisms = \
        sasl-server-mech-login.c \
        sasl-server-mech-oauth2.c \
        sasl-server-mech-otp.c \
-       sasl-server-mech-plain-common.c \
        sasl-server-mech-plain.c \
        sasl-server-mech-scram.c \
        sasl-server-mech-winbind.c
@@ -64,8 +63,7 @@ headers = \
        sasl-server-oauth2.h \
        sasl-server-protected.h \
        sasl-server-private.h \
-       sasl-server-mech-scram.h \
-       sasl-server-mech-plain-common.h
+       sasl-server-mech-scram.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-sasl/sasl-server-mech-external.c b/src/lib-sasl/sasl-server-mech-external.c
index 5f44eaad4421a6b01f36cdf9d1c3364be7bc5d97..1bad258bce375aa46049dba09c3c63312499f197 100644 (file)
--- a/src/lib-sasl/sasl-server-mech-external.c
+++ b/src/lib-sasl/sasl-server-mech-external.c
@@ -3,7 +3,6 @@
 #include "lib.h"
 
 #include "sasl-server-protected.h"
-#include "sasl-server-mech-plain-common.h"
 
 static void
 mech_external_auth_continue(struct sasl_server_mech_request *request,

diff --git a/src/lib-sasl/sasl-server-mech-login.c b/src/lib-sasl/sasl-server-mech-login.c
index a1698aa4113bd1e7952c8c51be7489a28779b93b..b4d77ddcf746d70433df8835c5ae4ec30dda7b72 100644 (file)
--- a/src/lib-sasl/sasl-server-mech-login.c
+++ b/src/lib-sasl/sasl-server-mech-login.c
@@ -10,7 +10,6 @@
 #include "safe-memset.h"
 
 #include "sasl-server-protected.h"
-#include "sasl-server-mech-plain-common.h"
 
 static void
 mech_login_auth_continue(struct sasl_server_mech_request *request,

diff --git a/src/lib-sasl/sasl-server-mech-plain-common.c b/src/lib-sasl/sasl-server-mech-plain-common.c
deleted file mode 100644 (file)
index fc2ab6d..0000000
--- a/src/lib-sasl/sasl-server-mech-plain-common.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2009-2018 Dovecot authors, see the included COPYING file */
-
-#include "lib.h"
-
-#include "sasl-server-protected.h"
-#include "sasl-server-mech-plain-common.h"
-
-void sasl_server_mech_plain_verify_callback(
-       struct sasl_server_mech_request *request,
-       const struct sasl_passdb_result *result)
-{
-       switch (result->status) {
-       case SASL_PASSDB_RESULT_OK:
-               sasl_server_request_success(request, "", 0);
-               break;
-       case SASL_PASSDB_RESULT_INTERNAL_FAILURE:
-               sasl_server_request_internal_failure(request);
-               break;
-       default:
-               sasl_server_request_failure(request);
-               break;
-       }
-}

diff --git a/src/lib-sasl/sasl-server-mech-plain-common.h b/src/lib-sasl/sasl-server-mech-plain-common.h
deleted file mode 100644 (file)
index 125798c..0000000
--- a/src/lib-sasl/sasl-server-mech-plain-common.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef SASL_SERVER_MECH_PLAIN_COMMON_H
-#define SASL_SERVER_MECH_PLAIN_COMMON_H
-
-void sasl_server_mech_plain_verify_callback(
-       struct sasl_server_mech_request *request,
-       const struct sasl_passdb_result *result);
-
-#endif

diff --git a/src/lib-sasl/sasl-server-mech-plain.c b/src/lib-sasl/sasl-server-mech-plain.c
index 66ff1689eb10ed6b90096cfb76f6bb685f3768bb..a203d3ad361a4471dfd27da0720474ffca66a64b 100644 (file)
--- a/src/lib-sasl/sasl-server-mech-plain.c
+++ b/src/lib-sasl/sasl-server-mech-plain.c
@@ -4,7 +4,6 @@
 #include "safe-memset.h"
 
 #include "sasl-server-protected.h"
-#include "sasl-server-mech-plain-common.h"
 
 static void
 mech_plain_auth_continue(struct sasl_server_mech_request *request,

diff --git a/src/lib-sasl/sasl-server-mech.c b/src/lib-sasl/sasl-server-mech.c
index 35e90ccc29fcf3adefd846b459a4db9b766b109c..6410697dc77b389158a8f3d9f54c9bd9d014df6b 100644 (file)
--- a/src/lib-sasl/sasl-server-mech.c
+++ b/src/lib-sasl/sasl-server-mech.c
@@ -45,6 +45,23 @@ void sasl_server_mech_generic_auth_initial(
        }
 }
 
+void sasl_server_mech_plain_verify_callback(
+       struct sasl_server_mech_request *request,
+       const struct sasl_passdb_result *result)
+{
+       switch (result->status) {
+       case SASL_PASSDB_RESULT_OK:
+               sasl_server_request_success(request, "", 0);
+               break;
+       case SASL_PASSDB_RESULT_INTERNAL_FAILURE:
+               sasl_server_request_internal_failure(request);
+               break;
+       default:
+               sasl_server_request_failure(request);
+               break;
+       }
+}
+
 /*
  * Global data
  */

diff --git a/src/lib-sasl/sasl-server-protected.h b/src/lib-sasl/sasl-server-protected.h
index f91a9de706a7e1eb9f185d8e5bb2fe34dfa716d5..acea156a49014056530a7adf483d9443bba91a39 100644 (file)
--- a/src/lib-sasl/sasl-server-protected.h
+++ b/src/lib-sasl/sasl-server-protected.h
@@ -91,6 +91,10 @@ void sasl_server_mech_generic_auth_initial(
        struct sasl_server_mech_request *mreq,
        const unsigned char *data, size_t data_size);
 
+void sasl_server_mech_plain_verify_callback(
+       struct sasl_server_mech_request *request,
+       const struct sasl_passdb_result *result);
+
 /*
  * Request
  */