Add SLAP_MR_ORDERED_INDEX - support for inequality indexing. Currently

[openldap] / servers / slapd / ldapsync.c

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 27da812abd8ea2d786bebbb97f16d486932caa99..c0b916193666aa78780447c2de20611ae3e09564 100644 (file)
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -22,7 +22,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
 #include "../../libraries/liblber/lber-int.h" /* get ber_strndup() */
@@ -59,7 +58,7 @@ slap_build_sync_state_ctrl(
        ber_init2( ber, 0, LBER_USE_DER );
        ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
 
-       ctrls[num_ctrls] = sl_malloc ( sizeof ( LDAPControl ), op->o_tmpmemctx );
+       ctrls[num_ctrls] = slap_sl_malloc ( sizeof ( LDAPControl ), op->o_tmpmemctx );
 
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
                AttributeDescription *desc = a->a_desc;
@@ -86,15 +85,9 @@ slap_build_sync_state_ctrl(
        ber_free_buf( ber );
 
        if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "slap_build_sync_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "slap_build_sync_ctrl: ber_flatten2 failed\n",
                        0, 0, 0 );
-#endif
                send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
                return ret;
        }
@@ -137,15 +130,9 @@ slap_build_sync_done_ctrl(
        ber_free_buf( ber );
 
        if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "slap_build_sync_done_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "slap_build_sync_done_ctrl: ber_flatten2 failed\n",
                        0, 0, 0 );
-#endif
                send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
                return ret;
        }
@@ -200,15 +187,9 @@ slap_build_sync_state_ctrl_from_slog(
        ber_free_buf( ber );
 
        if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS, 
-                       "slap_build_sync_ctrl: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "slap_build_sync_ctrl: ber_flatten2 failed\n",
                        0, 0, 0 );
-#endif
                send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
                return ret;
        }
@@ -263,15 +244,9 @@ slap_send_syncinfo(
                        ber_printf( ber, "N}" );
                        break;
                default:
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( OPERATION, RESULTS,
-                               "slap_send_syncinfo: invalid syncinfo type (%d)\n",
-                               type, 0, 0 );
-#else
                        Debug( LDAP_DEBUG_TRACE,
                                "slap_send_syncinfo: invalid syncinfo type (%d)\n",
                                type, 0, 0 );
-#endif
                        return LDAP_OTHER;
                }
        }
@@ -279,15 +254,9 @@ slap_send_syncinfo(
        ret = ber_flatten2( ber, &rspdata, 0 );
 
        if ( ret < 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( OPERATION, RESULTS,
-                       "slap_send_syncinfo: ber_flatten2 failed\n",
-                       0, 0, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE,
                        "slap_send_syncinfo: ber_flatten2 failed\n",
                        0, 0, 0 );
-#endif
                send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
                return ret;
        }