dovecot-2.0: auth: Removed userdb checking code from passdb code...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/4f06636cd03f
changeset: 11150:4f06636cd03f
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 14 15:57:43 2010 +0300
description:
auth: Removed userdb checking code from passdb code paths.

diffstat:

 src/auth/auth-worker-client.c |  15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diffs (46 lines):

diff -r ca663b6f63a4 -r 4f06636cd03f src/auth/auth-worker-client.c
--- a/src/auth/auth-worker-client.c	Wed Apr 14 15:40:26 2010 +0300
+++ b/src/auth/auth-worker-client.c	Wed Apr 14 15:57:43 2010 +0300
@@ -93,7 +93,6 @@
 	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 @@
 				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 @@
 	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 @@
 		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);