moved rdn parsing in a dedicated routine, ldap_str2rdn(), that can be used directly...

[openldap] / libraries / libldap / search.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index cfcfd8cf307bd421690c1bc4a0fcdcc3bafecbef..50f50067ff92dfe2d6d32fcd46f9226367758429 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -301,15 +301,15 @@ ldap_build_search_req(
        if ( LDAP_IS_UDP(ld) ) {
            err = ber_write( ber, ld->ld_options.ldo_peer,
                    sizeof(struct sockaddr), 0);
-           if (err == sizeof(struct sockaddr)) {
-               char *dn = ld->ld_options.ldo_cldapdn;
-               if (!dn) dn = "";
-               err = ber_printf( ber, "{ist{seeiib", ++ld->ld_msgid, dn,
-                   LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
-                   (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
-                   (timelimit < 0) ? ld->ld_timelimit : timelimit,
-                   attrsonly );
-           }
+       }
+       if ( LDAP_IS_UDP(ld) && ld->ld_options.ldo_version == LDAP_VERSION2) {
+           char *dn = ld->ld_options.ldo_cldapdn;
+           if (!dn) dn = "";
+           err = ber_printf( ber, "{ist{seeiib", ++ld->ld_msgid, dn,
+               LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
+               (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
+               (timelimit < 0) ? ld->ld_timelimit : timelimit,
+               attrsonly );
        } else
 #endif
        {