auth: mech - Remove redundant NUL checks

Partially reverts ce7a61301cb233647c447dd917d5df1184d02317

The check is moved to higher up in call chain.

diff --git a/src/auth/mech-external.c b/src/auth/mech-external.c
index 512288b7437fbaa890a6f57d31bfe41536520d33..b9a287b2fc7f7638ff8592693274599653db1b0f 100644 (file)
--- a/src/auth/mech-external.c
+++ b/src/auth/mech-external.c
@@ -11,9 +11,6 @@ mech_external_auth_continue(struct auth_request *request,
 {
        const char *authzid, *error;
 
-       if (auth_request_fail_on_nuls(request, data, data_size))
-               return;
-
        authzid = t_strndup(data, data_size);
        if (request->user == NULL) {
                e_info(request->mech_event,

diff --git a/src/auth/mech-login.c b/src/auth/mech-login.c
index 4a8a41a166f52a5a0eea6d9503c2426a5fbb5d27..e4da330b9345ff83ca8c607b4b94a132a161eb76 100644 (file)
--- a/src/auth/mech-login.c
+++ b/src/auth/mech-login.c
@@ -20,9 +20,6 @@ mech_login_auth_continue(struct auth_request *request,
        static const char prompt2[] = "Password:";
        const char *username, *error;
 
-       if (auth_request_fail_on_nuls(request, data, data_size))
-               return;
-
        if (request->user == NULL) {
                username = t_strndup(data, data_size);
 

diff --git a/src/auth/mech-otp.c b/src/auth/mech-otp.c
index 16aec961eb7671e415ea4321daed1f59441b2ff1..1b7ae8393a9a9c5082ef305990c4e8b46145189d 100644 (file)
--- a/src/auth/mech-otp.c
+++ b/src/auth/mech-otp.c
@@ -23,9 +23,6 @@ otp_send_challenge(struct auth_request *auth_request,
                (struct otp_auth_request *)auth_request;
        const char *answer;
 
-       if (auth_request_fail_on_nuls(auth_request, credentials, size))
-               return;
-
        if (otp_parse_dbentry(t_strndup(credentials, size),
                              &request->state) != 0) {
                e_error(request->auth_request.mech_event,
@@ -204,9 +201,6 @@ static void
 mech_otp_auth_phase2(struct auth_request *auth_request,
                     const unsigned char *data, size_t data_size)
 {
-       if (auth_request_fail_on_nuls(auth_request, data, data_size))
-               return;
-
        const char *str = t_strndup(data, data_size);
 
        if (str_begins(str, "hex:")) {

diff --git a/src/auth/mech-scram.c b/src/auth/mech-scram.c
index 14f556bb129c9f89858a29ab8a0e6633b96673a8..35fedc91ab653dbf10e1dad66a7812f519a9028c 100644 (file)
--- a/src/auth/mech-scram.c
+++ b/src/auth/mech-scram.c
@@ -361,9 +361,6 @@ void mech_scram_auth_continue(struct auth_request *auth_request,
        const char *server_final_message;
        size_t len;
 
-       if (auth_request_fail_on_nuls(auth_request, data, data_size))
-               return;
-
        if (request->client_first_message_bare == NULL) {
                /* Received client-first-message */
                if (parse_scram_client_first(request, data,

diff --git a/src/auth/mech-skey.c b/src/auth/mech-skey.c
index 7ba2db86615bd6d9f9932f03313807a0cd459a16..d6819a85902dbd9497451dcaab957b84d2d5e571 100644 (file)
--- a/src/auth/mech-skey.c
+++ b/src/auth/mech-skey.c
@@ -162,9 +162,6 @@ static void
 mech_skey_auth_continue(struct auth_request *auth_request,
                       const unsigned char *data, size_t data_size)
 {
-       if (auth_request_fail_on_nuls(auth_request, data, data_size))
-               return;
-
        if (auth_request->user == NULL) {
                mech_skey_auth_phase1(auth_request, data, data_size);
        } else {