[dovecot-cvs] dovecot/src/auth passdb-ldap.c, 1.27, 1.28 passdb-sql.c, 1.16, 1.17

[cras at dovecot.org]

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

Modified Files:
	passdb-ldap.c passdb-sql.c 
Log Message:
Don't crash if password lookup failed.



Index: passdb-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-ldap.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- passdb-ldap.c	7 Apr 2005 23:42:46 -0000	1.27
+++ passdb-ldap.c	8 Apr 2005 10:25:50 -0000	1.28
@@ -119,7 +119,8 @@
 		return;
 
 	scheme = password_get_scheme(&password);
-	i_assert(scheme != NULL); /* auth_request_set_field() sets it */
+	/* auth_request_set_field() sets scheme */
+	i_assert(password == NULL || scheme != NULL);
 
 	if (ldap_request->credentials != -1) {
 		passdb_handle_credentials(passdb_result,

Index: passdb-sql.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/passdb-sql.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- passdb-sql.c	7 Apr 2005 23:42:46 -0000	1.16
+++ passdb-sql.c	8 Apr 2005 10:25:50 -0000	1.17
@@ -87,7 +87,8 @@
 	}
 
 	scheme = password_get_scheme(&password);
-	i_assert(scheme != NULL); /* auth_request_set_field() sets it */
+	/* auth_request_set_field() sets scheme */
+	i_assert(password == NULL || scheme != NULL);
 
 	if (sql_request->credentials != -1) {
 		passdb_handle_credentials(passdb_result,