From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 7 May 2020 11:15:14 +0000 (+0300)
Subject: auth: Move auth_request_fail_on_nuls to auth-request.c
X-Git-Tag: 2.3.11.2~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16abfc0f37e4da8e8990bf1885f6f9ea532a1269;p=thirdparty%2Fdovecot%2Fcore.git

auth: Move auth_request_fail_on_nuls to auth-request.c

Where is belongs to
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index a1fa51d412..3571e4ccf3 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -630,6 +630,19 @@ bool auth_request_import(struct auth_request *request,
 	return TRUE;
 }
 
+static bool auth_request_fail_on_nuls(struct auth_request *request,
+			       const unsigned char *data, size_t data_size)
+{
+	if ((request->mech->flags & MECH_SEC_ALLOW_NULS) != 0)
+		return FALSE;
+	if (memchr(data, '\0', data_size) != NULL) {
+		e_debug(request->mech_event, "Unexpected NUL in auth data");
+		auth_request_fail(request);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 void auth_request_initial(struct auth_request *request)
 {
 	i_assert(request->state == AUTH_REQUEST_STATE_NEW);
diff --git a/src/auth/mech.c b/src/auth/mech.c
index 8f4d8a6464..d12c0db2d7 100644
--- a/src/auth/mech.c
+++ b/src/auth/mech.c
@@ -65,19 +65,6 @@ void mech_generic_auth_free(struct auth_request *request)
 	pool_unref(&request->pool);
 }
 
-bool auth_request_fail_on_nuls(struct auth_request *request,
-			       const unsigned char *data, size_t data_size)
-{
-	if ((request->mech->flags & MECH_SEC_ALLOW_NULS) != 0)
-		return FALSE;
-	if (memchr(data, '\0', data_size) != NULL) {
-		e_debug(request->mech_event, "Unexpected NUL in auth data");
-		auth_request_fail(request);
-		return TRUE;
-	}
-	return FALSE;
-}
-
 extern const struct mech_module mech_plain;
 extern const struct mech_module mech_login;
 extern const struct mech_module mech_apop;
diff --git a/src/auth/mech.h b/src/auth/mech.h
index 55d9e9ed70..4a9f593586 100644
--- a/src/auth/mech.h
+++ b/src/auth/mech.h
@@ -64,8 +64,6 @@ const struct mech_module *mech_module_find(const char *name);
 void mech_generic_auth_initial(struct auth_request *request,
 			       const unsigned char *data, size_t data_size);
 void mech_generic_auth_free(struct auth_request *request);
-bool auth_request_fail_on_nuls(struct auth_request *request,
-			       const unsigned char *data, size_t data_size);
 
 struct mechanisms_register *
 mech_register_init(const struct auth_settings *set);