SLAP_NVALUES back-monitor temporary hack

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index 91a7802a9f0b2798aca4834e718e5b6308762f27..e19d1d6e80ca3814a88b5e5eec8368e5d5742ed6 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -110,8 +110,8 @@ monitor_subsys_backend_init(
                bv[0].bv_len = strlen( bv[0].bv_val );
                bv[1].bv_val = NULL;
 
-               attr_merge( e, monitor_ad_desc, bv );
-               attr_merge( e_backend, monitor_ad_desc, bv );
+               attr_mergeit( e, monitor_ad_desc, bv );
+               attr_mergeit( e_backend, monitor_ad_desc, bv );
 
                if ( bi->bi_controls ) {
                        int j;
@@ -119,7 +119,7 @@ monitor_subsys_backend_init(
                        for ( j = 0; bi->bi_controls[ j ]; j++ ) {
                                bv[0].bv_val = bi->bi_controls[ j ];
                                bv[0].bv_len = strlen( bv[0].bv_val );
-                               attr_merge( e, slap_schema.si_ad_supportedControl, bv );
+                               attr_mergeit( e, slap_schema.si_ad_supportedControl, bv );
                        }
                }
                

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index 937b44d2f64a1cfee0f1971e865fd738ace5d417..3b75a1b94ab871d5ec8a621a5f67cec542b1fcf5 100644 (file)
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -105,7 +105,7 @@ monitor_subsys_conn_init(
        bv[1].bv_val = NULL;
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -163,7 +163,7 @@ monitor_subsys_conn_init(
        bv[1].bv_val = NULL;
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -336,7 +336,7 @@ conn_create(
        bv[1].bv_val = NULL;
        bv[0].bv_val = buf;
        bv[0].bv_len = strlen( buf );
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
 
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 96204196527bfc2b00c1bb13ef1913dbeac243a6..0a2ee4b13dd31fc88d90c42811ab496d56a4874c 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -136,11 +136,11 @@ monitor_subsys_database_init(
                }
                
                if ( be->be_flags & SLAP_BFLAG_MONITOR ) {
-                       attr_merge( e, ad_mc, be->be_suffix );
-                       attr_merge( e_database, ad_mc, be->be_suffix );
+                       attr_mergeit( e, ad_mc, be->be_suffix );
+                       attr_mergeit( e_database, ad_mc, be->be_suffix );
                } else {
-                       attr_merge( e, ad_nc, be->be_suffix );
-                       attr_merge( e_database, ad_nc, be->be_suffix );
+                       attr_mergeit( e, ad_nc, be->be_suffix );
+                       attr_mergeit( e_database, ad_nc, be->be_suffix );
                }
 
                for ( j = nBackendInfo; j--; ) {
@@ -152,7 +152,7 @@ monitor_subsys_database_init(
                                        j, monitor_subsys[SLAPD_MONITOR_BACKEND].mss_dn.bv_val );
                                bv.bv_val = buf;
                                bv.bv_len = strlen( buf );
-                               attr_merge_one( e, ad_seeAlso, &bv );
+                               attr_mergeit_one( e, ad_seeAlso, &bv );
                                break;
                        }
                }
@@ -239,7 +239,7 @@ monitor_back_add_plugin( Backend *be, Entry *e_database )
 
                bv.bv_val = buf;
                bv.bv_len = strlen( buf );
-               attr_merge_one( e_database, monitor_ad_desc, &bv );
+               attr_mergeit_one( e_database, monitor_ad_desc, &bv );
 
                i++;
 

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index ed754ce39695f1ea022426bdee8452cad3337628..4c68e7491b76d12b5269bf8222703b4d1aa11593 100644 (file)
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -427,7 +427,7 @@ monitor_back_db_init(
        } else {
                bv[0].bv_len = strlen( Versionstr );
        }
-       if ( attr_merge( e, monitor_ad_desc, bv ) ) {
+       if ( attr_mergeit( e, monitor_ad_desc, bv ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, CRIT,
                        "unable to add description to '%s' entry\n",

diff --git a/servers/slapd/back-monitor/listener.c b/servers/slapd/back-monitor/listener.c
index 71879643f713cccbba70a1cc37039dd4ccb3cbe9..c66e1c5f2fb01fb6286d9486f3caea623829355e 100644 (file)
--- a/servers/slapd/back-monitor/listener.c
+++ b/servers/slapd/back-monitor/listener.c
@@ -126,7 +126,7 @@ monitor_subsys_listener_init(
                        bv[1].bv_val = NULL;
                        bv[0].bv_val = "TLS";
                        bv[0].bv_len = sizeof("TLS")-1;
-                       attr_merge( e, monitor_ad_desc, bv );
+                       attr_mergeit( e, monitor_ad_desc, bv );
                }
 #endif /* HAVE_TLS */
 #ifdef LDAP_CONNECTIONLESS
@@ -135,7 +135,7 @@ monitor_subsys_listener_init(
                        bv[1].bv_val = NULL;
                        bv[0].bv_val = "UDP";
                        bv[0].bv_len = sizeof("UDP")-1;
-                       attr_merge( e, monitor_ad_desc, bv );
+                       attr_mergeit( e, monitor_ad_desc, bv );
                }
 #endif /* HAVE_TLS */
 

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index b15053ae25bbc2d8d4108b5db170ed7b8fa2690e..121820dc0947a6de9dea81856cb508a5ccce1e77 100644 (file)
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -117,7 +117,7 @@ monitor_subsys_log_init(
                        bv[0].bv_val = ( char * )int_2_level[ i ].s;
                        bv[0].bv_len = strlen( bv[0].bv_val );
 
-                       attr_merge( e, monitor_ad_desc, bv );
+                       attr_mergeit( e, monitor_ad_desc, bv );
                }
        }
 
@@ -151,7 +151,7 @@ monitor_subsys_log_modify(
                 */
                if ( is_at_operational( mod->sm_desc->ad_type ) ) {
                        ( void ) attr_delete( &e->e_attrs, mod->sm_desc );
-                       rc = attr_merge( e, mod->sm_desc, mod->sm_bvalues );
+                       rc = attr_mergeit( e, mod->sm_desc, mod->sm_bvalues );
                        if ( rc != 0 ) {
                                rc = LDAP_OTHER;
                                break;
@@ -347,8 +347,8 @@ add_values( Entry *e, Modification *mod, int *newlevel )
        }
 
        /* no - add them */
-       if ( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
-               /* this should return result of attr_merge */
+       if ( attr_mergeit( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
+               /* this should return result of attr_mergeit */
                return LDAP_OTHER;
        }
 
@@ -471,7 +471,7 @@ replace_values( Entry *e, Modification *mod, int *newlevel )
        }
 
        if ( mod->sm_bvalues != NULL &&
-               attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
+               attr_mergeit( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
                return LDAP_OTHER;
        }
 

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index 71ce6cb07ea17ac02c815d126fdcec3ce9072f05..5ce6d1db26fa81ed3b53adf4c2b80b854532b39d 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -124,7 +124,7 @@ monitor_subsys_ops_init(
        bv[1].bv_val = NULL;
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -192,7 +192,7 @@ monitor_subsys_ops_init(
                bv[1].bv_val = NULL;
                bv[0].bv_val = "0";
                bv[0].bv_len = 1;
-               attr_merge( e, monitor_ad_desc, bv );
+               attr_mergeit( e, monitor_ad_desc, bv );
        
                mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
                e->e_private = ( void * )mp;
@@ -259,7 +259,7 @@ monitor_subsys_ops_init(
 
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -326,7 +326,7 @@ monitor_subsys_ops_init(
 
                bv[0].bv_val = "0";
                bv[0].bv_len = 1;
-               attr_merge( e, monitor_ad_desc, bv );
+               attr_mergeit( e, monitor_ad_desc, bv );
        
                mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
                e->e_private = ( void * )mp;

diff --git a/servers/slapd/back-monitor/rww.c b/servers/slapd/back-monitor/rww.c
index 904a81afaefe2941642b72297ed009aa8f0fe8f5..c68dfab365b2e966c6be519a52f179c942b03dc2 100644 (file)
--- a/servers/slapd/back-monitor/rww.c
+++ b/servers/slapd/back-monitor/rww.c
@@ -119,7 +119,7 @@ monitor_subsys_readw_update_internal(
        if ( b == NULL || b[0].bv_val == NULL ) {
                bv[0].bv_val = buf;
                bv[0].bv_len = strlen( buf );
-               attr_merge( e, monitor_ad_desc, bv );
+               attr_mergeit( e, monitor_ad_desc, bv );
        }
 
        return( 0 );

diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c
index 99bd329a78a552972ca105308a4d2612b9f5efd9..137e8efb8ce60b64756e721b44143d1f403a69e1 100644 (file)
--- a/servers/slapd/back-monitor/sent.c
+++ b/servers/slapd/back-monitor/sent.c
@@ -102,7 +102,7 @@ monitor_subsys_sent_init(
        bv[1].bv_val = NULL;
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -158,7 +158,7 @@ monitor_subsys_sent_init(
 
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -214,7 +214,7 @@ monitor_subsys_sent_init(
 
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;
@@ -270,7 +270,7 @@ monitor_subsys_sent_init(
 
        bv[0].bv_val = "0";
        bv[0].bv_len = 1;
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
        
        mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
        e->e_private = ( void * )mp;

diff --git a/servers/slapd/back-monitor/thread.c b/servers/slapd/back-monitor/thread.c
index 85331e597d80d34e8ee6462588d34a770e542d52..36d7d6132f3bad71c18a03877229e1834cbdfddb 100644 (file)
--- a/servers/slapd/back-monitor/thread.c
+++ b/servers/slapd/back-monitor/thread.c
@@ -76,7 +76,7 @@ monitor_subsys_thread_init(
        bv[0].bv_val = buf;
        bv[0].bv_len = strlen( bv[0].bv_val );
 
-       attr_merge( e, monitor_ad_desc, bv );
+       attr_mergeit( e, monitor_ad_desc, bv );
 
        monitor_cache_release( mi, e );
 
@@ -113,7 +113,7 @@ monitor_subsys_thread_update(
        if ( b == NULL || b[0].bv_val == NULL ) {
                bv[0].bv_val = buf;
                bv[0].bv_len = strlen( buf );
-               attr_merge( e, monitor_ad_desc, bv );
+               attr_mergeit( e, monitor_ad_desc, bv );
        }
 
        return( 0 );

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 98ed4e6c461b39a6e896896604416fa4c97dfe9d..c85866f60c81cc705d2408a98ef4be454e3da4f4 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -133,6 +133,9 @@ LDAP_SLAPD_F (void) attr_free LDAP_P(( Attribute *a ));
 LDAP_SLAPD_F (Attribute *) attr_dup LDAP_P(( Attribute *a ));
 
 #ifdef SLAP_NVALUES
+#define attr_mergeit( e, d, v ) attr_merge( e, d, v, NULL /* FIXME */ )
+#define attr_mergeit_one( e, d, v ) attr_merge_one( e, d, v, NULL /* FIXME */ )
+
 LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
        AttributeDescription *desc,
        BerVarray vals,
@@ -142,6 +145,8 @@ LDAP_SLAPD_F (int) attr_merge_one LDAP_P(( Entry *e,
        struct berval *val,
        struct berval *nval ));
 #else
+#define attr_mergeit( e, d, v ) attr_merge( e, d, v )
+#define attr_mergeit_one( e, d, v ) attr_merge( e, d, v )
 LDAP_SLAPD_F (int) attr_merge LDAP_P(( Entry *e,
        AttributeDescription *desc,
        BerVarray vals ));