[dovecot-cvs] dovecot/src/auth auth-request.c, 1.55, 1.56 userdb-prefetch.c, 1.2, 1.3

[cras at dovecot.org]

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

Modified Files:
	auth-request.c userdb-prefetch.c 
Log Message:
Allow prefetch userdb to exist nicely with other userdbs.



Index: auth-request.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- auth-request.c	9 Apr 2006 11:53:59 -0000	1.55
+++ auth-request.c	9 Apr 2006 13:54:46 -0000	1.56
@@ -504,9 +504,6 @@
 {
 	if (reply == NULL && request->userdb->next != NULL) {
 		/* try next userdb. */
-		if (request->extra_fields != NULL)
-			auth_stream_reply_reset(request->extra_fields);
-
 		request->userdb = request->userdb->next;
 		auth_request_lookup_user(request,
 					 request->private_callback.userdb);

Index: userdb-prefetch.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/userdb-prefetch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- userdb-prefetch.c	13 Jan 2006 20:25:57 -0000	1.2
+++ userdb-prefetch.c	9 Apr 2006 13:54:46 -0000	1.3
@@ -20,8 +20,15 @@
 	bool uid_seen, gid_seen;
 
 	if (auth_request->extra_fields == NULL) {
-		auth_request_log_error(auth_request, "prefetch",
-				       "passdb didn't return userdb entries");
+		if (auth_request->auth->userdbs->next == NULL) {
+			/* no other userdbs */
+			auth_request_log_error(auth_request, "prefetch",
+				"passdb didn't return userdb entries");
+		} else {
+			/* more userdbs, they may know the user */
+			auth_request_log_info(auth_request, "prefetch",
+				"passdb didn't return userdb entries");
+		}
 		callback(NULL, auth_request);
 		return;
 	}