[dovecot-cvs] dovecot/src/auth auth-request.c,1.58.2.3,1.58.2.4

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv24698

Modified Files:
      Tag: branch_1_0
	auth-request.c 
Log Message:
If multiple passdbs were configured and we tried to authenticate as user
which was in more than one of them with different passwords, we gave
"multiple passwords not supported" error.



Index: auth-request.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.c,v
retrieving revision 1.58.2.3
retrieving revision 1.58.2.4
diff -u -d -r1.58.2.3 -r1.58.2.4
--- auth-request.c	16 Jun 2006 09:59:32 -0000	1.58.2.3
+++ auth-request.c	17 Jun 2006 15:22:58 -0000	1.58.2.4
@@ -314,6 +314,7 @@
 				/* this wasn't the final passdb lookup,
 				   continue to next passdb */
 				request->passdb = request->passdb->next;
+				request->passdb_password = NULL;
 				return FALSE;
 			}
 		}
@@ -326,6 +327,7 @@
 		   *result != PASSDB_RESULT_USER_DISABLED) {
 		/* try next passdb. */
                 request->passdb = request->passdb->next;
+		request->passdb_password = NULL;
 
                 if (*result == PASSDB_RESULT_INTERNAL_FAILURE) {
 			/* remember that we have had an internal failure. at