BDB_INDEX code does no harm (but no good yet, not used by filters yet).

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 3ee2d569dbc1118b1b410def0df37a9b21bad79d..f869f86c91d2f0eddc4f8817f1c31ba1627d84d3 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -215,9 +215,9 @@ static long send_ldap_ber(
                 */
 
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                           "send_ldap_ber: conn %d  ber_flush failed err=%d (%s)\n",
-                           conn ? conn->c_connid : 0, err, sock_errstr(err) ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_ldap_ber: conn %d  ber_flush failed err=%d (%s)\n",
+                          conn ? conn->c_connid : 0, err, sock_errstr(err) ));
 #else
                Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
                    err, sock_errstr(err), 0 );
@@ -273,9 +273,9 @@ send_ldap_response(
        ber = ber_alloc_t( LBER_USE_DER );
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_ldap_response: conn %d  msgid=%ld tag=%ld err=%ld\n",
-                   conn ? conn->c_connid : 0, (long)msgid, (long)tag, (long)err ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_ldap_response: conn %d  msgid=%ld tag=%ld err=%ld\n",
+                  conn ? conn->c_connid : 0, (long)msgid, (long)tag, (long)err ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_response: msgid=%ld tag=%ld err=%ld\n",
@@ -285,10 +285,10 @@ send_ldap_response(
 
        if( ref ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                       "send_ldap_response: conn %d  ref=\"%s\"\n",
-                       conn ? conn->c_connid : 0,
-                       ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                          "send_ldap_response: conn %d  ref=\"%s\"\n",
+                          conn ? conn->c_connid : 0,
+                          ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
 #else
                Debug( LDAP_DEBUG_ARGS, "send_ldap_response: ref=\"%s\"\n",
                        ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL",
@@ -299,9 +299,9 @@ send_ldap_response(
 
        if ( ber == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_ldap_response: conn %d  ber_alloc failed\n",
-                       conn ? conn->c_connid : 0 ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_ldap_response: conn %d  ber_alloc failed\n",
+                          conn ? conn->c_connid : 0 ));
 #else
                Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
 #endif
@@ -309,10 +309,34 @@ send_ldap_response(
                return;
        }
 
-       rc = ber_printf( ber, "{it{ess",
+#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", LDAP_LEVEL_ERR,
+                          "send_ldap_response: conn %d  ber_write failed\n",
+                          conn ? conn->c_connid : 0 ));
+#else
+               Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
+#endif
+               ber_free(ber, 1);
+               return;
+           }
+       }
+       if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
+           rc = ber_printf( ber, "{is{t{ess",
+               msgid, "", tag, err,
+               matched == NULL ? "" : matched,
+               text == NULL ? "" : text );
+       } else
+#endif
+       {
+           rc = ber_printf( ber, "{it{ess",
                msgid, tag, err,
                matched == NULL ? "" : matched,
                text == NULL ? "" : text );
+       }
 
        if( rc != -1 ) {
                if ( ref != NULL ) {
@@ -342,12 +366,17 @@ send_ldap_response(
        if( rc != -1 ) {
                rc = ber_printf( ber, "N}N}" );
        }
+#ifdef LDAP_CONNECTIONLESS
+       if( conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1 ) {
+               rc = ber_printf( ber, "N}" );
+       }
+#endif
 
        if ( rc == -1 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_ldap_response: conn %d  ber_printf failed\n",
-                       conn ? conn->c_connid : 0 ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_ldap_response: conn %d  ber_printf failed\n",
+                          conn ? conn->c_connid : 0 ));
 #else
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -362,9 +391,9 @@ send_ldap_response(
 
        if ( bytes < 0 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_ldap_response: conn %d ber write failed\n",
-                       conn ? conn->c_connid : 0 ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_ldap_response: conn %d ber write failed\n",
+                          conn ? conn->c_connid : 0 ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "send_ldap_response: ber write failed\n",
@@ -402,9 +431,9 @@ send_ldap_disconnect(
        assert( LDAP_UNSOLICITED_ERROR( err ) );
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_ldap_disconnect: conn %d  %d:%s\n",
-                   conn ? conn->c_connid : 0, err, text ? text : "" ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_ldap_disconnect: conn %d  %d:%s\n",
+                  conn ? conn->c_connid : 0, err, text ? text : "" ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_disconnect %d:%s\n",
@@ -428,9 +457,9 @@ send_ldap_disconnect(
                reqoid, NULL, NULL, NULL );
 
        Statslog( LDAP_DEBUG_STATS,
-           "conn=%ld op=%ld DISCONNECT err=%ld tag=%lu text=%s\n",
+           "conn=%ld op=%ld DISCONNECT tag=%lu err=%ld text=%s\n",
                (long) op->o_connid, (long) op->o_opid,
-               (long) tag, (long) err, text ? text : "" );
+               (unsigned long) tag, (long) err, text ? text : "" );
 }
 
 void
@@ -451,9 +480,9 @@ send_ldap_result(
        assert( !LDAP_API_ERROR( err ) );
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_ldap_result : conn %ld   op=%ld p=%d\n",
-                   (long)op->o_connid, (long)op->o_opid, op->o_protocol ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_ldap_result : conn %ld   op=%ld p=%d\n",
+                  (long)op->o_connid, (long)op->o_opid, op->o_protocol ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_result: conn=%ld op=%ld p=%d\n",
@@ -461,21 +490,21 @@ send_ldap_result(
 #endif
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                   "send_ldap_result: conn=%ld err=%d matched=\"%s\" text=\"%s\"\n",
-                   (long)op->o_connid, err, matched ? matched : "", text ? text : "" ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "send_ldap_result: conn=%ld err=%d matched=\"%s\" text=\"%s\"\n",
+                  (long)op->o_connid, err, matched ? matched : "", text ? text : "" ));
 #else
        Debug( LDAP_DEBUG_ARGS,
                "send_ldap_result: err=%d matched=\"%s\" text=\"%s\"\n",
-               err, matched ?  matched : "", text ? text : "" );
+               err, matched ?  matched : "", text ? text : "" );
 #endif
 
 
        if( ref ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                       "send_ldap_result: referral=\"%s\"\n",
-                       ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                          "send_ldap_result: referral=\"%s\"\n",
+                          ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "send_ldap_result: referral=\"%s\"\n",
@@ -515,7 +544,7 @@ send_ldap_result(
        Statslog( LDAP_DEBUG_STATS,
            "conn=%ld op=%ld RESULT tag=%lu err=%ld text=%s\n",
                (long) op->o_connid, (long) op->o_opid,
-               (long) tag, (long) err, text ? text : "" );
+               (unsigned long) tag, (long) err, text ? text : "" );
 
        if( tmp != NULL ) {
                ch_free(tmp);
@@ -538,9 +567,9 @@ send_ldap_sasl(
        ber_int_t msgid;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_ldap_sasl: conn %d err=%ld len=%ld\n",
-                   op->o_connid, (long)err, cred ? cred->bv_len : -1 ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_ldap_sasl: conn %d err=%ld len=%ld\n",
+                  op->o_connid, (long)err, cred ? cred->bv_len : -1 ));
 #else
        Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl: err=%ld len=%ld\n",
                (long) err, cred ? cred->bv_len : -1, NULL );
@@ -552,7 +581,7 @@ send_ldap_sasl(
 
        send_ldap_response( conn, op, tag, msgid,
                err, matched, text, ref,
-               NULL, NULL, cred, ctrls  );
+               NULL, NULL, cred, ctrls  );
 }
 
 void
@@ -572,10 +601,10 @@ send_ldap_extended(
        ber_int_t msgid;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_ldap_extended: conn %d  err=%ld oid=%s len=%ld\n",
-                   op->o_connid, (long)err, rspoid ? rspoid : "",
-                   rspdata != NULL ? (long)rspdata->bv_len : (long)0 ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_ldap_extended: conn %d  err=%ld oid=%s len=%ld\n",
+                  op->o_connid, (long)err, rspoid ? rspoid : "",
+                  rspdata != NULL ? (long)rspdata->bv_len : (long)0 ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_extended err=%ld oid=%s len=%ld\n",
@@ -612,14 +641,14 @@ send_search_result(
        assert( !LDAP_API_ERROR( err ) );
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_search_result: conn %d err=%d matched=\"%s\"\n",
-                   op->o_connid, err, matched ? matched : "",
-                   text ? text : "" ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_search_result: conn %d err=%d matched=\"%s\"\n",
+                  op->o_connid, err, matched ? matched : "",
+                  text ? text : "" ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "send_search_result: err=%d matched=\"%s\" text=\"%s\"\n",
-               err, matched ?  matched : "", text ? text : "" );
+               err, matched ?  matched : "", text ? text : "" );
 #endif
 
 
@@ -657,7 +686,7 @@ send_search_result(
        Statslog( LDAP_DEBUG_STATS,
            "conn=%ld op=%ld SEARCH RESULT tag=%lu err=%ld text=%s\n",
                (long) op->o_connid, (long) op->o_opid,
-               (long) tag, (long) err, text ? text : "" );
+               (unsigned long) tag, (long) err, text ? text : "" );
 
        if (tmp != NULL) {
            ch_free(tmp);
@@ -679,17 +708,17 @@ send_search_entry(
        BerElement      *ber;
        Attribute       *a, *aa;
        int             i, rc=-1, bytes;
-       char            *edn;
+       char            *edn;
        int             userattrs;
        int             opattrs;
 
        AttributeDescription *ad_entry = slap_schema.si_ad_entry;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_search_entry: conn %d  dn=\"%s\"%s\n",
-                   op->o_connid, e->e_dn,
-                   attrsonly ? " (attrsOnly)" : "" ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_search_entry: conn %d  dn=\"%s\"%s\n",
+                  op->o_connid, e->e_dn,
+                  attrsonly ? " (attrsOnly)" : "" ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "=> send_search_entry: dn=\"%s\"%s\n",
@@ -701,9 +730,9 @@ send_search_entry(
                ad_entry, NULL, ACL_READ ) )
        {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                       "send_search_entry: conn %d access to entry (%s) not allowed\n",
-                       op->o_connid, e->e_dn ));
+               LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                          "send_search_entry: conn %d access to entry (%s) not allowed\n",
+                          op->o_connid, e->e_dn ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "send_search_entry: access to entry not allowed\n",
@@ -719,9 +748,9 @@ send_search_entry(
 
        if ( ber == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_search_entry: conn %d  ber_alloc failed\n",
-                       op->o_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_search_entry: conn %d  ber_alloc failed\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
 #endif
@@ -731,14 +760,36 @@ send_search_entry(
                goto error_return;
        }
 
-       rc = ber_printf( ber, "{it{s{" /*}}}*/, op->o_msgid,
+#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", LDAP_LEVEL_ERR,
+                          "send_search_entry: conn %d  ber_printf failed\n",
+                          conn ? conn->c_connid : 0 ));
+#else
+               Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+#endif
+               ber_free(ber, 1);
+               return;
+           }
+       }
+       if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
+           rc = ber_printf( ber, "{is{t{s{",
+               op->o_msgid, "", LDAP_RES_SEARCH_ENTRY, e->e_dn );
+       } else
+#endif
+       {
+           rc = ber_printf( ber, "{it{s{" /*}}}*/, op->o_msgid,
                LDAP_RES_SEARCH_ENTRY, e->e_dn );
+       }
 
        if ( rc == -1 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_search_entry: conn %d  ber_printf failed\n",
-                       op->o_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_search_entry: conn %d  ber_printf failed\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -783,9 +834,9 @@ send_search_entry(
 
                if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                               "send_search_entry: conn %d  access to attribute %s not allowed\n",
-                               op->o_connid, desc->ad_cname->bv_val ));
+                       LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                                  "send_search_entry: conn %d  access to attribute %s not allowed\n",
+                                  op->o_connid, desc->ad_cname->bv_val ));
 #else
                        Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
                            desc->ad_cname->bv_val, 0, 0 );
@@ -796,9 +847,9 @@ send_search_entry(
 
                if (( rc = ber_printf( ber, "{s[" /*]}*/ , type )) == -1 ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "send_search_entry: conn %d  ber_printf failed\n",
-                               op->o_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "send_search_entry: conn %d  ber_printf failed\n",
+                                  op->o_connid ));
 #else
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -815,13 +866,13 @@ send_search_entry(
                                        desc, a->a_vals[i], ACL_READ ) )
                                {
 #ifdef NEW_LOGGING
-                                    LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                                               "send_search_entry: conn %d  access to attribute %s, value %d not allowed\n",
-                                               op->o_connid, desc->ad_cname->bv_val, i ));
+                                       LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                                                  "send_search_entry: conn %d  access to attribute %s, value %d not allowed\n",
+                                                  op->o_connid, desc->ad_cname->bv_val, i ));
 #else
                                        Debug( LDAP_DEBUG_ACL,
                                                "acl: access to attribute %s, value %d not allowed\n",
-                                       desc->ad_cname->bv_val, i, 0 );
+                                       desc->ad_cname->bv_val, i, 0 );
 #endif
 
                                        continue;
@@ -829,9 +880,9 @@ send_search_entry(
 
                                if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
 #ifdef NEW_LOGGING
-                                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                               "send_search_entry: conn %d  ber_printf failed.\n",
-                                               op->o_connid ));
+                                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                                  "send_search_entry: conn %d  ber_printf failed.\n",
+                                                  op->o_connid ));
 #else
                                        Debug( LDAP_DEBUG_ANY,
                                            "ber_printf failed\n", 0, 0, 0 );
@@ -847,9 +898,9 @@ send_search_entry(
 
                if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "send_search_entry: conn %d  ber_printf failed\n",
-                               op->o_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "send_search_entry: conn %d  ber_printf failed\n",
+                                  op->o_connid ));
 #else
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -890,9 +941,9 @@ send_search_entry(
 
                if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                               "send_search_entry: conn %s  access to attribute %s not allowed\n",
-                               op->o_connid, desc->ad_cname->bv_val ));
+                       LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                                  "send_search_entry: conn %s  access to attribute %s not allowed\n",
+                                  op->o_connid, desc->ad_cname->bv_val ));
 #else
                        Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
                            desc->ad_cname->bv_val, 0, 0 );
@@ -904,9 +955,9 @@ send_search_entry(
                rc = ber_printf( ber, "{s[" /*]}*/ , desc->ad_cname->bv_val );
                if ( rc == -1 ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "send_search_entry: conn %d  ber_printf failed\n",
-                               op->o_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "send_search_entry: conn %d  ber_printf failed\n",
+                                  op->o_connid ));
 #else
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -914,6 +965,7 @@ send_search_entry(
                        ber_free( ber, 1 );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encoding description error", NULL, NULL );
+                       attrs_free( aa );
                        goto error_return;
                }
 
@@ -923,13 +975,13 @@ send_search_entry(
                                        desc, a->a_vals[i], ACL_READ ) )
                                {
 #ifdef NEW_LOGGING
-                                    LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                                               "send_search_entry: conn %d access to %s, value %d not allowed\n",
-                                               op->o_connid, desc->ad_cname->bv_val, i ));
+                                       LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                                                  "send_search_entry: conn %d access to %s, value %d not allowed\n",
+                                                  op->o_connid, desc->ad_cname->bv_val, i ));
 #else
                                        Debug( LDAP_DEBUG_ACL,
                                                "acl: access to attribute %s, value %d not allowed\n",
-                                       desc->ad_cname->bv_val, i, 0 );
+                                       desc->ad_cname->bv_val, i, 0 );
 #endif
 
                                        continue;
@@ -938,9 +990,9 @@ send_search_entry(
 
                                if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
 #ifdef NEW_LOGGING
-                                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                               "send_search_entry: conn %d  ber_printf failed\n",
-                                               op->o_connid ));
+                                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                                  "send_search_entry: conn %d  ber_printf failed\n",
+                                                  op->o_connid ));
 #else
                                        Debug( LDAP_DEBUG_ANY,
                                            "ber_printf failed\n", 0, 0, 0 );
@@ -949,6 +1001,7 @@ send_search_entry(
                                        ber_free( ber, 1 );
                                        send_ldap_result( conn, op, LDAP_OTHER,
                                                NULL, "encoding values error", NULL, NULL );
+                                       attrs_free( aa );
                                        goto error_return;
                                }
                        }
@@ -956,9 +1009,9 @@ send_search_entry(
 
                if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "send_search_entry: conn %d  ber_printf failed\n",
-                               op->o_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "send_search_entry: conn %d  ber_printf failed\n",
+                                  op->o_connid ));
 #else
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -966,6 +1019,7 @@ send_search_entry(
                        ber_free( ber, 1 );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encode end error", NULL, NULL );
+                       attrs_free( aa );
                        goto error_return;
                }
        }
@@ -974,11 +1028,15 @@ send_search_entry(
 
        rc = ber_printf( ber, /*{{{*/ "}N}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", LDAP_LEVEL_ERR,
-                       "send_search_entry: conn %d ber_printf failed\n",
-                       op->o_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_search_entry: conn %d ber_printf failed\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
@@ -994,9 +1052,9 @@ send_search_entry(
 
        if ( bytes < 0 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_ldap_response: conn %d  ber write failed.\n",
-                       op->o_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_ldap_response: conn %d  ber write failed.\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "send_ldap_response: ber write failed\n",
@@ -1016,9 +1074,9 @@ send_search_entry(
            (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_search_entry: conn %d exit.\n",
-                   op->o_connid ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_search_entry: conn %d exit.\n",
+                  op->o_connid ));
 #else
        Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 );
 #endif
@@ -1050,9 +1108,9 @@ send_search_reference(
        AttributeDescription *ad_entry = slap_schema.si_ad_entry;
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_search_reference: conn %d  dn=\"%s\"\n",
-                   op->o_connid, e->e_dn ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_search_reference: conn %d  dn=\"%s\"\n",
+                  op->o_connid, e->e_dn ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "=> send_search_reference: dn=\"%s\"\n",
@@ -1064,9 +1122,9 @@ send_search_reference(
                ad_entry, NULL, ACL_READ ) )
        {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                       "send_search_reference: conn %d  access to entry %s not allowed\n",
-                       op->o_connid, e->e_dn ));
+               LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                          "send_search_reference: conn %d      access to entry %s not allowed\n",
+                          op->o_connid, e->e_dn ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "send_search_reference: access to entry not allowed\n",
@@ -1080,9 +1138,9 @@ send_search_reference(
                ad_ref, NULL, ACL_READ ) )
        {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-                       "send_search_reference: conn %d access to reference not allowed.\n",
-                       op->o_connid ));
+               LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
+                          "send_search_reference: conn %d access to reference not allowed.\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ACL,
                        "send_search_reference: access to reference not allowed\n",
@@ -1094,9 +1152,9 @@ send_search_reference(
 
        if( refs == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_search_reference: null ref in (%s).\n",
-                       op->o_connid, e->e_dn ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_search_reference: null ref in (%s).\n",
+                          op->o_connid, e->e_dn ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "send_search_reference: null ref in (%s)\n", 
@@ -1118,9 +1176,9 @@ send_search_reference(
 
        if ( ber == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_search_reference: conn %d ber_alloc failed\n",
-                       op->o_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_search_reference: conn %d ber_alloc failed\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "send_search_reference: ber_alloc failed\n", 0, 0, 0 );
@@ -1136,9 +1194,9 @@ send_search_reference(
 
        if ( rc == -1 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "send_search_reference: conn %d  ber_printf failed.\n",
-                       op->o_connid ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "send_search_reference: conn %d      ber_printf failed.\n",
+                          op->o_connid ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "send_search_reference: ber_printf failed\n", 0, 0, 0 );
@@ -1159,12 +1217,12 @@ send_search_reference(
        num_pdu_sent++;
        ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
 
-       Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld ENTRY dn=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld REF dn=\"%s\"\n",
            (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "send_search_reference: conn %d exit.\n", op->o_connid ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "send_search_reference: conn %d exit.\n", op->o_connid ));
 #else
        Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
 #endif
@@ -1191,8 +1249,8 @@ str2result(
 
        if ( strncasecmp( s, "RESULT", 6 ) != 0 ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                       "str2result: (%s), expecting \"RESULT\"\n", s ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "str2result: (%s), expecting \"RESULT\"\n", s ));
 #else
                Debug( LDAP_DEBUG_ANY, "str2result (%s) expecting \"RESULT\"\n",
                    s, 0, 0 );
@@ -1226,8 +1284,8 @@ str2result(
                        }
                } else {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "str2result: (%s) unknown.\n", s ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "str2result: (%s) unknown.\n", s ));
 #else
                        Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n",
                            s, 0, 0 );