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 a1fa51d412f267f082a212925e34f0b5151bc91d..3571e4ccf39e2e85e4a77803755a1ba985c4ae9f 100644 (file)
--- 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 8f4d8a64642ea244923c50be72f1169bfc0921d1..d12c0db2d7c90810bc475be09362cd32d9370d6f 100644 (file)
--- 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 55d9e9ed704da02f8a032849646ca7fa1cd2cef2..4a9f59358656173b1857076f72550c5096953dac 100644 (file)
--- 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);