[dovecot-cvs] dovecot/src/auth mech.c,1.48,1.49

[cras at dovecot.org]

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

Modified Files:
	mech.c 
Log Message:
Crashfix for passdb cache. Patch by Andrey Panin.



Index: mech.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/mech.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mech.c	6 Dec 2004 16:42:12 -0000	1.48
+++ mech.c	6 Dec 2004 16:55:57 -0000	1.49
@@ -259,7 +259,8 @@
 
 	if (passdb_cache != NULL && cache_key != NULL) {
 		str = t_str_new(64);
-		str_append_str(str, extra->str);
+		if (extra->str != NULL)
+			str_append_str(str, extra->str);
 		if (extra->request->no_failure_delay) {
 			if (str_len(str) > 0)
 				str_append_c(str, '\t');
@@ -267,7 +268,8 @@
 		}
 		auth_cache_insert(passdb_cache, extra->request, cache_key,
 				  t_strconcat(extra->password == NULL ? "" :
-					      extra->password, "\t",
+					      extra->password,
+					      str_len(str) > 0 ? "\t" : "",
 					      str_c(str), NULL));
 	}