[dovecot-cvs] dovecot/src/auth auth-request.c, 1.40, 1.41 passdb-cache.c, 1.13, 1.14

[cras at dovecot.org]

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

Modified Files:
	auth-request.c passdb-cache.c 
Log Message:
Don't crash if cache key isn't set but cache is enabled.



Index: auth-request.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/auth-request.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- auth-request.c	28 Oct 2005 12:03:07 -0000	1.40
+++ auth-request.c	6 Dec 2005 14:37:15 -0000	1.41
@@ -338,12 +338,10 @@
 	request->private_callback.verify_plain = callback;
 
 	cache_key = passdb_cache == NULL ? NULL : passdb->cache_key;
-	if (cache_key != NULL) {
-		if (passdb_cache_verify_plain(request, cache_key, password,
-					      &result, FALSE)) {
-			callback(result, request);
-			return;
-		}
+	if (passdb_cache_verify_plain(request, cache_key, password,
+				      &result, FALSE)) {
+		callback(result, request);
+		return;
 	}
 
 	request->state = AUTH_REQUEST_STATE_PASSDB;

Index: passdb-cache.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-cache.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- passdb-cache.c	16 Oct 2005 12:03:37 -0000	1.13
+++ passdb-cache.c	6 Dec 2005 14:37:15 -0000	1.14
@@ -39,7 +39,7 @@
 	const char *value, *cached_pw, *scheme, *const *list;
 	int ret, expired;
 
-	if (passdb_cache == NULL)
+	if (passdb_cache == NULL || key == NULL)
 		return FALSE;
 
 	/* value = password \t ... */