[dovecot-cvs] dovecot/src/login-common client-common.h, 1.9.2.1, 1.9.2.2 sasl-server.c, 1.10.2.1, 1.10.2.2

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv19163/login-common

Modified Files:
      Tag: branch_1_0
	client-common.h sasl-server.c 
Log Message:
Crashfixes and more asserts. Mostly related to use of AUTHENTICATE/AUTH
commands.



Index: client-common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/client-common.h,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- client-common.h	10 Aug 2006 21:14:52 -0000	1.9.2.1
+++ client-common.h	7 Nov 2006 15:06:18 -0000	1.9.2.2
@@ -23,6 +23,7 @@
 	unsigned int tls:1;
 	unsigned int secured:1;
 	unsigned int authenticating:1;
+	unsigned int waiting_auth_reply:1;
 	/* ... */
 };
 

Index: sasl-server.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/sasl-server.c,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- sasl-server.c	5 Jun 2006 20:25:08 -0000	1.10.2.1
+++ sasl-server.c	7 Nov 2006 15:06:18 -0000	1.10.2.2
@@ -37,6 +37,7 @@
 	unsigned int i;
 	bool nologin;
 
+	i_assert(client->auth_request == request);
 	if (!client->authenticating) {
 		/* client aborted */
 		i_assert(status < 0);
@@ -46,14 +47,7 @@
 	switch (status) {
 	case 0:
 		/* continue */
-		if (client->auth_request != NULL) {
-			i_assert(client->auth_request == request);
-		} else {
-			i_assert(client->auth_request == NULL);
-
-			client->auth_request = request;
-		}
-
+		client->waiting_auth_reply = FALSE;
 		client->sasl_callback(client, SASL_SERVER_REPLY_CONTINUE,
 				      data_base64, NULL);
 		break;