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 816e031dfe7fa94264c993983506f122404ee253..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;
@@ -129,12 +126,12 @@ struct berval **get_entry_referrals(
        unsigned i, j;
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       AttributeDescription *ref = slap_schema.si_ad_ref;
+       AttributeDescription *ad_ref = slap_schema.si_ad_ref;
 #else
-       static const char *ref = "ref";
+       static const char *ad_ref = "ref";
 #endif
 
-       attr = attr_find( e->e_attrs, ref );
+       attr = attr_find( e->e_attrs, ad_ref );
 
        if( attr == NULL ) return NULL;
 
@@ -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,8 +290,14 @@ send_ldap_response(
                        matched == NULL ? "" : matched,
                        text == NULL ? "" : text );
 
-               if( rc != -1 && ref != NULL ) {
-                       rc = ber_printf( ber, "{V}", 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 ) {
@@ -371,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 ),
@@ -411,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 );
 
@@ -437,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 ),
@@ -483,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 ),
@@ -505,7 +523,7 @@ send_ldap_extended(
     const char *matched,
     const char *text,
     struct berval **refs,
-    char               *rspoid,
+    const char         *rspoid,
        struct berval *rspdata,
        LDAPControl **ctrls
 )
@@ -524,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 ),
@@ -587,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 ),
@@ -629,15 +649,15 @@ send_search_entry(
        int             opattrs;
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       AttributeDescription *entry = slap_schema.si_ad_entry;
+       AttributeDescription *ad_entry = slap_schema.si_ad_entry;
 #else
-       static const char *entry = "entry";
+       static const char *ad_entry = "entry";
 #endif
 
        Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: \"%s\"\n", e->e_dn, 0, 0 );
 
        if ( ! access_allowed( be, conn, op, e,
-               entry, NULL, ACL_READ ) )
+               ad_entry, NULL, ACL_READ ) )
        {
                Debug( LDAP_DEBUG_ACL, "acl: access to entry not allowed\n",
                    0, 0, 0 );
@@ -655,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 ) {
@@ -901,17 +921,17 @@ send_search_reference(
        int bytes;
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       AttributeDescription *ref = slap_schema.si_ad_ref;
-       AttributeDescription *entry = slap_schema.si_ad_entry;
+       AttributeDescription *ad_ref = slap_schema.si_ad_ref;
+       AttributeDescription *ad_entry = slap_schema.si_ad_entry;
 #else
-       static const char *ref = "ref";
-       static const char *entry = "entry";
+       static const char *ad_ref = "ref";
+       static const char *ad_entry = "entry";
 #endif
 
        Debug( LDAP_DEBUG_TRACE, "=> send_search_reference (%s)\n", e->e_dn, 0, 0 );
 
        if ( ! access_allowed( be, conn, op, e,
-               entry, NULL, ACL_READ ) )
+               ad_entry, NULL, ACL_READ ) )
        {
                Debug( LDAP_DEBUG_ACL,
                        "send_search_reference: access to entry not allowed\n",
@@ -920,7 +940,7 @@ send_search_reference(
        }
 
        if ( ! access_allowed( be, conn, op, e,
-               ref, NULL, ACL_READ ) )
+               ad_ref, NULL, ACL_READ ) )
        {
                Debug( LDAP_DEBUG_ACL,
                        "send_search_reference: access to reference not allowed\n",