From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 4 Nov 2023 20:51:55 +0000 (+0100)
Subject: lib-sasl: sasl-server - Merge sasl-server-mech-plain-common into sasl-server-mech
X-Git-Tag: 2.4.2~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99fcdd9b242b196a1fde1b7a8e15e23ffa6cdb7e;p=thirdparty%2Fdovecot%2Fcore.git

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 688239a219..86f9e6e521 100644
--- 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 5f44eaad44..1bad258bce 100644
--- 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 a1698aa411..b4d77ddcf7 100644
--- 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
index fc2ab6de3b..0000000000
--- 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
index 125798cbad..0000000000
--- 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 66ff1689eb..a203d3ad36 100644
--- 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 35e90ccc29..6410697dc7 100644
--- 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 f91a9de706..acea156a49 100644
--- 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
  */