Fix ITS#5931 crasher bits

CHANGES

@@ -39,6 +39,7 @@ OpenLDAP 2.4.14 Engineering
 	Fixed slapd-ldap idassert-bind validity checking (ITS#5863)
 	Fixed slapd-ldap/meta RFC4525 increment support (ITS#5912)
 	Fixed slapd-ldap/meta search dereferencing (ITS#5916)
+	Fixed slapd-ldap/meta with intermediate response (ITS#5931)
 	Fixed slapd-ldif numerous bugs (ITS#5408)
 	Fixed slapd-ldif rename on same DN (ITS#5319)
 	Fixed slapd-ldif deadlock (ITS#5329)

servers/slapd/back-ldap/search.c

@@ -423,6 +423,12 @@ retry:
 				rs->sr_ctrls = NULL;
 			}
 
+		} else if ( rc == LDAP_RES_INTERMEDIATE ) {
+			Debug( LDAP_DEBUG_ANY,
+				"%s ldap_back_search: "
+				"intermediate response not supported yet.\n",
+				op->o_log_prefix, 0, 0 );
+
 		} else {
 			char		*err = NULL;
 

servers/slapd/back-meta/search.c

@@ -1411,6 +1411,16 @@ really_bad:;
 					 */
 					assert( ncandidates > 0 );
 					--ncandidates;
+
+				} else if ( rc == LDAP_RES_INTERMEDIATE ) {
+					/* TODO: ITS#5931 */
+
+					/* ignore right now */
+					Debug( LDAP_DEBUG_ANY,
+						"%s meta_back_search[%ld]: "
+						"intermediate response message not supported yet.\n",
+						op->o_log_prefix,
+						i, 0 );
 	
 				} else if ( rc == LDAP_RES_BIND ) {
 					meta_search_candidate_t	retcode;
@@ -1450,7 +1460,12 @@ really_bad:;
 					}
 	
 				} else {
-					assert( 0 );
+					Debug( LDAP_DEBUG_ANY,
+						"%s meta_back_search[%ld]: "
+						"unrecognized response message tag=%d\n",
+						op->o_log_prefix,
+						i, rc );
+				
 					ldap_msgfree( res );
 					res = NULL;
 					goto really_bad;