From: Timo Sirainen <tss@iki.fi>
Date: Tue, 8 Sep 2009 18:32:53 +0000 (-0400)
Subject: auth: Allow PASS lookups also in userdb sockets, not just master sockets.
X-Git-Tag: 2.0.alpha1~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bb8c135a1c065655fc4d2d89b74b4f958fe4f02;p=thirdparty%2Fdovecot%2Fcore.git

auth: Allow PASS lookups also in userdb sockets, not just master sockets.

--HG--
branch : HEAD
---

diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c
index 8fe7cc7319..ddfbe450b6 100644
--- a/src/auth/auth-master-connection.c
+++ b/src/auth/auth-master-connection.c
@@ -374,12 +374,12 @@ auth_master_input_line(struct auth_master_connection *conn, const char *line)
 		return master_input_user(conn, line + 5);
 	if (strncmp(line, "LIST\t", 5) == 0)
 		return master_input_list(conn, line + 5);
+	if (strncmp(line, "PASS\t", 5) == 0)
+		return master_input_pass(conn, line + 5);
 
 	if (!conn->userdb_only) {
 		if (strncmp(line, "REQUEST\t", 8) == 0)
 			return master_input_request(conn, line + 8);
-		if (strncmp(line, "PASS\t", 5) == 0)
-			return master_input_pass(conn, line + 5);
 		if (strncmp(line, "CPID\t", 5) == 0) {
 			i_error("Authentication client trying to connect to "
 				"master socket");
@@ -387,7 +387,8 @@ auth_master_input_line(struct auth_master_connection *conn, const char *line)
 		}
 	}
 
-	i_error("BUG: Unknown command in master socket: %s",
+	i_error("BUG: Unknown command in %s socket: %s",
+		conn->userdb_only ? "userdb" : "master",
 		str_sanitize(line, 80));
 	return FALSE;
 }