Mercurial > dovecot > original-hg > dovecot-1.2

changeset 5105:342429974bf5 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Assert-crashfixes
author Timo Sirainen <tss@iki.fi>
date Tue, 06 Feb 2007 11:49:46 +0200
parents ffd9df333232
children 81394e71f92a
files src/auth/passdb-blocking.c src/login-common/sasl-server.c
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/passdb-blocking.c	Mon Feb 05 16:15:56 2007 +0200
+++ b/src/auth/passdb-blocking.c	Tue Feb 06 11:49:46 2007 +0200
@@ -87,7 +87,8 @@
 	}
 
 	if (*reply != '\0') {
-		i_assert(auth_stream_is_empty(request->extra_fields));
+		i_assert(auth_stream_is_empty(request->extra_fields) ||
+			 request->master_user != NULL);
 
 		for (tmp = t_strsplit(reply, "\t"); *tmp != NULL; tmp++) {
 			p = strchr(*tmp, '=');
@@ -122,7 +123,8 @@
 {
 	string_t *str;
 
-	i_assert(auth_stream_is_empty(request->extra_fields));
+	i_assert(auth_stream_is_empty(request->extra_fields) ||
+		 request->master_user != NULL);
 
 	str = t_str_new(64);
 	str_printfa(str, "PASSV\t%u\t", request->passdb->id);
@@ -154,7 +156,8 @@
 {
 	string_t *str;
 
-	i_assert(auth_stream_is_empty(request->extra_fields));
+	i_assert(auth_stream_is_empty(request->extra_fields) ||
+		 request->master_user != NULL);
 
 	str = t_str_new(64);
 	str_printfa(str, "PASSL\t%u\t%d\t",
--- a/src/login-common/sasl-server.c	Mon Feb 05 16:15:56 2007 +0200
+++ b/src/login-common/sasl-server.c	Tue Feb 06 11:49:46 2007 +0200
@@ -37,13 +37,13 @@
 	unsigned int i;
 	bool nologin;
 
-	i_assert(client->auth_request == request);
 	if (!client->authenticating) {
 		/* client aborted */
 		i_assert(status < 0);
 		return;
 	}
 
+	i_assert(client->auth_request == request);
 	switch (status) {
 	case 0:
 		/* continue */