Fix typos in last commit

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 2f9374e828192f84d3e89608fbc48ed9dbf8b3ff..2e412aeb5f52eb1f6e14629d3ca1187446f98f2b 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -17,7 +17,10 @@
 #include <ac/unistd.h>
 
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 static char *v2ref( BerVarray ref, const char *text )
 {
@@ -241,6 +244,12 @@ send_ldap_response(
                        text, ref, resoid, resdata, sasldata, ctrls );
                return;
        }
+               
+#ifdef LDAP_CONNECTIONLESS
+       if (conn->c_is_udp)
+               ber = op->o_res_ber;
+       else
+#endif
 
        ber_init_w_nullc( ber, LBER_USE_DER );
 
@@ -268,27 +277,12 @@ send_ldap_response(
        }
 
 #ifdef LDAP_CONNECTIONLESS
-       if( conn->c_is_udp ) {
-           rc = ber_write(ber,
-                       (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
-           if (rc != sizeof(struct sockaddr)) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "send_ldap_response: conn %lu  ber_write failed\n",
-                       conn ? conn->c_connid : 0 , 0, 0);
-#else
-               Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
-#endif
-               ber_free_buf( ber );
-               return;
-           }
-       }
        if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
-           rc = ber_printf( ber, "{is{t{ess" /*"}}}"*/,
-               msgid, "", tag, err,
+               rc = ber_printf( ber, "t{ess" /*"}}"*/,
+                       tag, err,
                matched == NULL ? "" : matched,
                text == NULL ? "" : text );
-       } else
+       } else 
 #endif
        {
            rc = ber_printf( ber, "{it{ess" /*"}}"*/,
@@ -339,7 +333,7 @@ send_ldap_response(
                rc = ber_printf( ber, /*"{"*/ "N}" );
        }
 #endif
-
+               
        if ( rc == -1 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
@@ -349,12 +343,18 @@ send_ldap_response(
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+               if (conn->c_is_udp == 0)
+#endif
                ber_free_buf( ber );
                return;
        }
 
        /* send BER */
        bytes = send_ldap_ber( conn, ber );
+#ifdef LDAP_CONNECTIONLESS
+       if (conn->c_is_udp == 0)
+#endif
        ber_free_buf( ber );
 
        if ( bytes < 0 ) {
@@ -489,6 +489,11 @@ slap_send_ldap_result(
        assert( err != LDAP_PARTIAL_RESULTS );
 
        if ( err == LDAP_REFERRAL ) {
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+               if( op->o_domain_scope ) {
+                       ref = NULL;
+               }
+#endif
                if( ref == NULL ) {
                        err = LDAP_NO_SUCH_OBJECT;
                } else if ( op->o_protocol < LDAP_VERSION3 ) {
@@ -588,6 +593,40 @@ slap_send_ldap_extended(
                rspoid, rspdata, NULL, ctrls );
 }
 
+#ifdef LDAP_RES_INTERMEDIATE_RESP
+void
+slap_send_ldap_intermediate_resp(
+       Connection  *conn,
+       Operation   *op,
+       ber_int_t   err,
+       const char  *matched,
+       const char  *text,
+       BerVarray   refs,
+       const char  *rspoid,
+       struct berval *rspdata,
+       LDAPControl **ctrls )
+{
+       ber_tag_t tag;
+       ber_int_t msgid;
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ENTRY,
+               "send_ldap_intermediate: err=%d oid=%s len=%ld\n",
+               err, rspoid ? rspoid : "",
+               rspdata != NULL ? rspdata->bv_len : 0 );
+#else
+       Debug( LDAP_DEBUG_TRACE,
+               "send_ldap_intermediate: err=%d oid=%s len=%ld\n",
+               err,
+               rspoid ? rspoid : "",
+               rspdata != NULL ? rspdata->bv_len : 0 );
+#endif
+       tag = LDAP_RES_INTERMEDIATE_RESP;
+       msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+       send_ldap_response( conn, op, tag, msgid,
+               err, matched, text, refs,
+               rspoid, rspdata, NULL, ctrls );
+}
+#endif
 
 void
 slap_send_search_result(
@@ -733,29 +772,19 @@ slap_send_search_entry(
 
        edn = e->e_ndn;
 
+#ifdef LDAP_CONNECTIONLESS
+       if (conn->c_is_udp)
+           ber = op->o_res_ber;
+       else
+#endif
        ber_init_w_nullc( ber, LBER_USE_DER );
 
 #ifdef LDAP_CONNECTIONLESS
-       if (conn->c_is_udp) {
-           rc = ber_write(ber,
-                       (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
-           if (rc != sizeof(struct sockaddr)) {
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, ERR, 
-                               "send_search_entry: conn %lu  ber_write failed\n",
-                               conn ? conn->c_connid : 0, 0, 0 );
-#else
-                       Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
-#endif
-                       ber_free_buf( ber );
-                       return( 1 );
-           }
-       }
        if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
-           rc = ber_printf( ber, "{is{t{O{" /*}}}*/,
-               op->o_msgid, "", LDAP_RES_SEARCH_ENTRY, &e->e_name );
+           rc = ber_printf(ber, "t{O{" /*}}*/,
+               LDAP_RES_SEARCH_ENTRY, &e->e_name);
        } else
-#endif /* LDAP_CONNECTIONLESS */
+#endif
        {
            rc = ber_printf( ber, "{it{O{" /*}}}*/, op->o_msgid,
                LDAP_RES_SEARCH_ENTRY, &e->e_name );
@@ -770,6 +799,9 @@ slap_send_search_entry(
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+               if (conn->c_is_udp == 0)
+#endif
                ber_free_buf( ber );
                send_ldap_result( conn, op, LDAP_OTHER,
                    NULL, "encoding DN error", NULL, NULL );
@@ -833,6 +865,9 @@ slap_send_search_entry(
 #else
                        Debug( LDAP_DEBUG_ANY,
                                        "matched values filtering failed\n", 0, 0, 0 );
+#endif
+#ifdef LDAP_CONNECTIONLESS
+                       if (conn->c_is_udp == 0)
 #endif
                                ber_free( ber, 1 );
        
@@ -891,6 +926,9 @@ slap_send_search_entry(
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+                       if (conn->c_is_udp == 0)
+#endif
                        ber_free_buf( ber );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encoding description error", NULL, NULL );
@@ -931,6 +969,9 @@ slap_send_search_entry(
                                            "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+                                       if (conn->c_is_udp == 0)
+#endif
                                        ber_free_buf( ber );
                                        send_ldap_result( conn, op, LDAP_OTHER,
                                                NULL, "encoding values error",
@@ -949,6 +990,9 @@ slap_send_search_entry(
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+                       if (conn->c_is_udp == 0)
+#endif
                        ber_free_buf( ber );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encode end error", NULL, NULL );
@@ -1016,6 +1060,9 @@ slap_send_search_entry(
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "matched values filtering failed\n", 0, 0, 0 );
+#endif
+#ifdef LDAP_CONNECTIONLESS
+                       if (conn->c_is_udp == 0)
 #endif
                                ber_free( ber, 1 );
        
@@ -1077,6 +1124,9 @@ slap_send_search_entry(
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+                       if (conn->c_is_udp == 0)
+#endif
                        ber_free_buf( ber );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encoding description error", NULL, NULL );
@@ -1119,6 +1169,9 @@ slap_send_search_entry(
                                            "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+                                       if (conn->c_is_udp == 0)
+#endif
                                        ber_free_buf( ber );
                                        send_ldap_result( conn, op, LDAP_OTHER,
                                                NULL, "encoding values error", 
@@ -1139,6 +1192,9 @@ slap_send_search_entry(
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+                       if (conn->c_is_udp == 0)
+#endif
                        ber_free_buf( ber );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encode end error", NULL, NULL );
@@ -1200,15 +1256,15 @@ slap_send_search_entry(
                rc = send_ldap_controls( ber, ctrls );
        }
 
+#ifdef LDAP_CONNECTIONLESS
+       if( conn->c_is_udp && op->o_protocol == LDAP_VERSION2 ) {
+               ; /* empty, skip following if */
+       } else
+#endif
        if( rc != -1 ) {
                rc = ber_printf( ber, /*{*/ "N}" );
        }
 
-#ifdef LDAP_CONNECTIONLESS
-       if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1) {
-               rc = ber_printf( ber, "}" );
-       }
-#endif
        if ( rc == -1 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
@@ -1218,12 +1274,18 @@ slap_send_search_entry(
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+               if (conn->c_is_udp == 0)
+#endif
                ber_free_buf( ber );
                send_ldap_result( conn, op, LDAP_OTHER,
                        NULL, "encode entry end error", NULL, NULL );
                return( 1 );
        }
 
+#ifdef LDAP_CONNECTIONLESS
+       if (conn->c_is_udp == 0) {
+#endif
        bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
        ber_free_buf( ber );
 
@@ -1247,6 +1309,10 @@ slap_send_search_entry(
        num_pdu_sent++;
        ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
 
+#ifdef LDAP_CONNECTIONLESS
+       }
+#endif
+
        Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu ENTRY dn=\"%s\"\n",
            conn->c_connid, op->o_opid, e->e_dn, 0, 0 );
 
@@ -1283,6 +1349,10 @@ slap_send_search_reference(
        AttributeDescription *ad_ref = slap_schema.si_ad_ref;
        AttributeDescription *ad_entry = slap_schema.si_ad_entry;
 
+       if (op->o_callback && op->o_callback->sc_sendreference) {
+               return op->o_callback->sc_sendreference( be, conn, op, e, refs, ctrls, v2refs );
+       }
+
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, 
                "send_search_reference: conn %lu  dn=\"%s\"\n", 
@@ -1293,7 +1363,6 @@ slap_send_search_reference(
                e ? e->e_dn : "(null)", 0, 0 );
 #endif
 
-
        if (  e && ! access_allowed( be, conn, op, e,
                ad_entry, NULL, ACL_READ, NULL ) )
        {
@@ -1328,6 +1397,22 @@ slap_send_search_reference(
                return( 1 );
        }
 
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+       if( op->o_domain_scope ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                       "send_search_reference: conn %lu domainScope control in (%s).\n",
+                       op->o_connid, e->e_dn, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "send_search_reference: domainScope control in (%s)\n", 
+                       e->e_dn, 0, 0 );
+#endif
+
+               return( 0 );
+       }
+#endif
+
        if( refs == NULL ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
@@ -1351,6 +1436,11 @@ slap_send_search_reference(
                return 0;
        }
 
+#ifdef LDAP_CONNECTIONLESS
+       if (conn->c_is_udp)
+               ber = op->o_res_ber;
+       else
+#endif
        ber_init_w_nullc( ber, LBER_USE_DER );
 
        rc = ber_printf( ber, "{it{W}" /*"}"*/ , op->o_msgid,
@@ -1375,12 +1465,18 @@ slap_send_search_reference(
                        "send_search_reference: ber_printf failed\n", 0, 0, 0 );
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+               if (conn->c_is_udp == 0)
+#endif
                ber_free_buf( ber );
                send_ldap_result( conn, op, LDAP_OTHER,
                        NULL, "encode DN error", NULL, NULL );
                return -1;
        }
 
+#ifdef LDAP_CONNECTIONLESS
+       if (conn->c_is_udp == 0) {
+#endif
        bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
        ber_free_buf( ber );
 
@@ -1389,6 +1485,9 @@ slap_send_search_reference(
        num_refs_sent++;
        num_pdu_sent++;
        ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
+#ifdef LDAP_CONNECTIONLESS
+       }
+#endif
 
        Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu REF dn=\"%s\"\n",
                conn->c_connid, op->o_opid, e ? e->e_dn : "(null)", 0, 0 );