Use -llber set_nonblock implementation.

[openldap] / servers / ldapd / search.c

diff --git a/servers/ldapd/search.c b/servers/ldapd/search.c
index cd413856c48e0c17b1772bcbe71b6d287d89b75d..b57bdbe56cc3b315ff1dfdd08f1390e569873f58 100644 (file)
--- a/servers/ldapd/search.c
+++ b/servers/ldapd/search.c
@@ -552,7 +552,7 @@ search_result(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( m->m_cldap ) {
-               if ((ber = der_alloc()) == NULLBER ) {
+               if ((ber = der_alloc()) == NULL ) {
                        send_ldap_msgresult( sb, SEARCHRESTAG, m,
                            LDAP_OPERATIONS_ERROR, NULL, "der_alloc" );
                        return;
@@ -573,7 +573,7 @@ search_result(
                if ( !m->m_cldap )
 #endif /* LDAP_CONNECTIONLESS */
 
-                       if ( (ber = der_alloc()) == NULLBER ) {
+                       if ( (ber = der_alloc()) == NULL ) {
                                send_ldap_msgresult( sb, SEARCHRESTAG, m,
                                    LDAP_OPERATIONS_ERROR, NULL, "der_alloc" );
                                return;
@@ -700,8 +700,8 @@ search_result(
                            LDAP_OPERATIONS_ERROR, NULL, "ber_printf" );
                        return;
                }
-               SAFEMEMCPY( (char *)sb->sb_useaddr, &m->m_clientaddr,
-                   sizeof( struct sockaddr ));
+               ber_pvt_sb_udp_set_dst( sb, &m->m_clientaddr );
+
                if ( ber_flush( sb, ber, 1 ) != 0 ) {
                    send_ldap_msgresult( sb, SEARCHRESTAG, m, 
                        LDAP_RESULTS_TOO_LARGE, NULL, "ber_flush" );