Fix extensible filters

[openldap] / libraries / libldap / result.c

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 75f89e07473ab63982575577db1d03716388f5ee..0e6f4bf80f13b784eeb35a7f29ec49d53a05b6fb 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -166,9 +166,9 @@ chkResponseList(
                        }
 
                        for ( tmp = lm; tmp != NULL; tmp = tmp->lm_chain ) {
-                               if ( lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY
-                                   && lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE
-                                       && lm->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL )
+                               if ( tmp->lm_msgtype != LDAP_RES_SEARCH_ENTRY
+                                   && tmp->lm_msgtype != LDAP_RES_SEARCH_REFERENCE
+                                       && tmp->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL )
                                {
                                        break;
                                }
@@ -211,6 +211,7 @@ chkResponseList(
 #endif
     return lm;
 }
+
 static int
 wait4msg(
        LDAP *ld,
@@ -271,13 +272,13 @@ wait4msg(
                }
 
                    if ( lc == NULL ) {
-                           rc = do_ldap_select( ld, tvp );
+                           rc = ldap_int_select( ld, tvp );
 
 
 #ifdef LDAP_DEBUG
                            if ( rc == -1 ) {
                                Debug( LDAP_DEBUG_TRACE,
-                                       "do_ldap_select returned -1: errno %d\n",
+                                       "ldap_int_select returned -1: errno %d\n",
                                        errno, 0, 0 );
                            }
 #endif
@@ -334,7 +335,7 @@ try_read1msg(
        ber_int_t msgid,
        int all,
        Sockbuf *sb,
-    LDAPConn *lc,
+       LDAPConn *lc,
        LDAPMessage **result )
 {
        BerElement      *ber;
@@ -367,10 +368,16 @@ try_read1msg(
     }
 
        ber = lc->lconn_ber;
-       assert( BER_VALID (ber) );
+       assert( LBER_VALID (ber) );
 
        /* get the next message */
        errno = 0;
+#ifdef LDAP_CONNECTIONLESS
+       if ( LDAP_IS_UDP(ld) ) {
+               struct sockaddr from;
+               ber_int_sb_read(sb, &from, sizeof(struct sockaddr));
+       }
+#endif
        if ( (tag = ber_get_next( sb, &len, ber ))
            != LDAP_TAG_MESSAGE ) {
                if ( tag == LBER_DEFAULT) {
@@ -418,7 +425,14 @@ try_read1msg(
                ber_free( ber, 1 );
                return( -2 );   /* continue looking */
        }
-
+#ifdef LDAP_CONNECTIONLESS
+       if (LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
+               char *blank;
+               ber_scanf(ber, "a{", &blank);
+               if (blank)
+                       ber_memfree(blank);
+       }
+#endif
        /* the message type */
        if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
@@ -426,7 +440,8 @@ try_read1msg(
                return( -1 );
        }
 
-       Debug( LDAP_DEBUG_TRACE, "ldap_read: message type %s msgid %ld, original id %ld\n",
+       Debug( LDAP_DEBUG_TRACE,
+               "ldap_read: message type %s msgid %ld, original id %ld\n",
            ldap_int_msgtype2str( tag ),
                (long) lr->lr_msgid, (long) lr->lr_origid );
 
@@ -534,14 +549,13 @@ try_read1msg(
                        tmpber = *ber;  /* struct copy */
                        if ( v3ref == 1 ) {
                                ; /* V3 search reference or V3 referral sucessfully chased */
-                       } else
-                       if ( ber_scanf( &tmpber, "{iaa}", &lderr,
+                       } else if ( ber_scanf( &tmpber, "{iaa}", &lderr,
                            &lr->lr_res_matched, &lr->lr_res_error )
                            != LBER_ERROR ) {
                                if ( lderr != LDAP_SUCCESS ) {
                                        /* referrals are in error string */
                                        refer_cnt = ldap_chase_referrals( ld, lr,
-                                           &lr->lr_res_error, &hadref );
+                                               &lr->lr_res_error, -1, &hadref );
                                        lr->lr_status = LDAP_REQST_COMPLETED;
                                        Debug( LDAP_DEBUG_TRACE,
                                            "read1msg:  V2 referral chased, mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
@@ -597,9 +611,12 @@ Debug( LDAP_DEBUG_TRACE,
                        }
 
                        /* Check if all requests are finished, lr is now parent */
-                       for(tmplr=lr ; tmplr != NULL; tmplr=tmplr->lr_refnext) {
+                       tmplr = lr;
+                       if (tmplr->lr_status == LDAP_REQST_COMPLETED) {
+                               for(tmplr=lr->lr_child; tmplr != NULL; tmplr=tmplr->lr_refnext) {
                                if( tmplr->lr_status != LDAP_REQST_COMPLETED) {
                                        break;
+                                       }
                                }
                        }