do not assert when receiving intermediate response (partial fix to ITS#5931)

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index a25ee8f4fa19f20b1fd84c875032fc9372e42139..f797474a523532009d448c4e178431393c283b8e 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/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;
 

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 2e65f004b345cb6dec801fd02b925800b8302d19..95b8f853790db53e9a495ad4253e98f4ce7e232a 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/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;