]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: Removed userdb checking code from passdb code paths.
authorTimo Sirainen <tss@iki.fi>
Wed, 14 Apr 2010 12:57:43 +0000 (15:57 +0300)
committerTimo Sirainen <tss@iki.fi>
Wed, 14 Apr 2010 12:57:43 +0000 (15:57 +0300)
--HG--
branch : HEAD

src/auth/auth-worker-client.c

index 2a87c4d366507ca32558c1d9c7410881da850c30..62c893f78e28bc6f399a41e6e619aeead9c63891 100644 (file)
@@ -93,7 +93,6 @@ static void verify_plain_callback(enum passdb_result result,
        struct auth_worker_client *client = request->context;
        struct auth_stream_reply *reply;
        string_t *str;
-       const char *value;
 
        if (request->passdb_failure && result == PASSDB_RESULT_OK)
                result = PASSDB_RESULT_PASSWORD_MISMATCH;
@@ -123,13 +122,6 @@ static void verify_plain_callback(enum passdb_result result,
                                auth_stream_reply_export(request->extra_cache_fields);
                        auth_stream_reply_import(reply, fields);
                }
-       } else if (request->userdb_lookup_failed) {
-               value = auth_stream_reply_find(request->extra_fields, "reason");
-               if (value != NULL) {
-                       auth_stream_reply_add(reply, NULL, "");
-                       auth_stream_reply_add(reply, NULL, "");
-                       auth_stream_reply_add(reply, "reason", value);
-               }
        }
        str = auth_stream_reply_get_str(reply);
        str_append_c(str, '\n');
@@ -198,7 +190,6 @@ lookup_credentials_callback(enum passdb_result result,
        struct auth_worker_client *client = request->context;
        struct auth_stream_reply *reply;
        string_t *str;
-       const char *value;
 
        if (request->passdb_failure && result == PASSDB_RESULT_OK)
                result = PASSDB_RESULT_PASSWORD_MISMATCH;
@@ -210,12 +201,6 @@ lookup_credentials_callback(enum passdb_result result,
                auth_stream_reply_add(reply, "FAIL", NULL);
                auth_stream_reply_add(reply, NULL,
                                      t_strdup_printf("%d", result));
-               value = auth_stream_reply_find(request->extra_fields, "reason");
-               if (request->userdb_lookup_failed && value != NULL) {
-                       auth_stream_reply_add(reply, NULL, "");
-                       auth_stream_reply_add(reply, NULL, "");
-                       auth_stream_reply_add(reply, "reason", value);
-               }
        } else {
                auth_stream_reply_add(reply, "OK", NULL);
                auth_stream_reply_add(reply, NULL, request->user);