Use "uri" directive (instead of "server") to specify server. Add "bin

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index c328690a284528f0893048e31a03a9da149faf01..75d30de43f01b29700b4fb598a95a33977eb0cc1 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -19,9 +19,6 @@
 
 #include "slap.h"
 
-/* we need LBER internals */
-#include "../../libraries/liblber/lber-int.h"
-
 static char *v2ref( struct berval **ref, const char *text )
 {
        size_t len = 0, i = 0;
@@ -196,6 +193,7 @@ static long send_ldap_ber(
        /* write the pdu */
        while( 1 ) {
                int err;
+               ber_socket_t    sd;
 
                if ( connection_state_closing( conn ) ) {
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
@@ -230,7 +228,8 @@ static long send_ldap_ber(
 
                /* wait for socket to be write-ready */
                conn->c_writewaiter = 1;
-               slapd_set_write( ber_pvt_sb_get_desc( conn->c_sb ), 1 );
+               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
+               slapd_set_write( sd, 1 );
 
                ldap_pvt_thread_cond_wait( &conn->c_write_cv, &conn->c_mutex );
                conn->c_writewaiter = 0;
@@ -268,6 +267,11 @@ send_ldap_response(
 
        Debug( LDAP_DEBUG_TRACE, "send_ldap_response: msgid=%ld tag=%ld err=%ld\n",
                (long) msgid, (long) tag, (long) err );
+       if( ref ) {
+               Debug( LDAP_DEBUG_ARGS, "send_ldap_response: ref=%s\n",
+                       ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL",
+                       NULL, NULL );
+       }
 
        if ( ber == NULL ) {
                Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
@@ -286,9 +290,14 @@ send_ldap_response(
                        matched == NULL ? "" : matched,
                        text == NULL ? "" : text );
 
-               if( rc != -1 && ref != NULL ) {
-                       rc = ber_printf( ber, "t{V}",
-                               LDAP_TAG_REFERRAL, ref );
+               if( rc != -1 ) {
+                       if ( ref != NULL ) {
+                               assert( err == LDAP_REFERRAL );
+                               rc = ber_printf( ber, "t{V}",
+                                       LDAP_TAG_REFERRAL, ref );
+                       } else {
+                               assert( err != LDAP_REFERRAL );
+                       }
                }
 
                if( rc != -1 && sasldata != NULL ) {
@@ -372,7 +381,8 @@ send_ldap_disconnect(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
+                   (void *)&op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),
@@ -412,6 +422,11 @@ send_ldap_result(
                (long) op->o_connid, (long) op->o_opid, op->o_protocol );
        Debug( LDAP_DEBUG_ARGS, "send_ldap_result: %d:%s:%s\n",
                err, matched ?  matched : "", text ? text : "" );
+       if( ref ) {
+       Debug( LDAP_DEBUG_ARGS, "send_ldap_result: referral: %s\n",
+               ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL",
+               NULL, NULL );
+       }
 
        assert( err != LDAP_PARTIAL_RESULTS );
 
@@ -438,7 +453,8 @@ send_ldap_result(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
+                   (void *)&op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),
@@ -484,7 +500,8 @@ send_ldap_sasl(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
+                   (void *)&op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),
@@ -525,7 +542,8 @@ send_ldap_extended(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
+                   (void *)&op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),
@@ -588,7 +606,8 @@ send_search_result(
 
 #ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
+                   (void *)&op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
                    &op->o_clientaddr)->sin_addr ),
@@ -656,7 +675,7 @@ send_search_entry(
                goto error_return;
        }
 
-       rc = ber_printf( ber, "{it{s{", op->o_msgid,
+       rc = ber_printf( ber, "{it{s{" /*}}}*/, op->o_msgid,
                LDAP_RES_SEARCH_ENTRY, e->e_dn );
 
        if ( rc == -1 ) {