Fix extensible filters

[openldap] / libraries / libldap / result.c

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index eb52071ae0c309c637a3ced97883ac4ec0a8a168..0e6f4bf80f13b784eeb35a7f29ec49d53a05b6fb 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -272,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
@@ -426,7 +426,7 @@ try_read1msg(
                return( -2 );   /* continue looking */
        }
 #ifdef LDAP_CONNECTIONLESS
-       if (LDAP_IS_UDP(ld)) {
+       if (LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
                char *blank;
                ber_scanf(ber, "a{", &blank);
                if (blank)