Added LDAP_LOG messages

[openldap] / libraries / libldap / result.c

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index eb52071ae0c309c637a3ced97883ac4ec0a8a168..16189ef36e2246ed9218a774f48043cc63054438 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -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,11 +426,9 @@ try_read1msg(
                return( -2 );   /* continue looking */
        }
 #ifdef LDAP_CONNECTIONLESS
-       if (LDAP_IS_UDP(ld)) {
-               char *blank;
-               ber_scanf(ber, "a{", &blank);
-               if (blank)
-                       ber_memfree(blank);
+       if (LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
+               struct berval blank;
+               ber_scanf(ber, "m{", &blank);
        }
 #endif
        /* the message type */