fix NOOP return code (ITS#4563; I'll check and confirm it later; NOOP support might...

[openldap] / servers / slapd / back-monitor / database.c

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index a5485577e6d2be974bd523034db1c403d0c0f1ed..02644819b9e459dde629a846d8ebdd32b14981f9 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -42,9 +42,6 @@ static int monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e );
 #if defined(SLAPD_LDAP) 
 #include "../back-ldap/back-ldap.h"
 #endif /* defined(SLAPD_LDAP) */
-#if 0 && defined(SLAPD_LDBM) 
-#include "../back-ldbm/back-ldbm.h"
-#endif /* defined(SLAPD_LDBM) */
 #if defined(SLAPD_META) 
 #include "../back-meta/back-meta.h"
 #endif /* defined(SLAPD_META) */
@@ -79,8 +76,8 @@ static struct restricted_ops_t {
 }, restricted_exops[] = {
        { BER_BVC( LDAP_EXOP_START_TLS ),       SLAP_RESTRICT_EXOP_START_TLS },
        { BER_BVC( LDAP_EXOP_MODIFY_PASSWD ),   SLAP_RESTRICT_EXOP_MODIFY_PASSWD },
-       { BER_BVC( LDAP_EXOP_X_WHO_AM_I ),      SLAP_RESTRICT_EXOP_WHOAMI },
-       { BER_BVC( LDAP_EXOP_X_CANCEL ),        SLAP_RESTRICT_EXOP_CANCEL },
+       { BER_BVC( LDAP_EXOP_WHO_AM_I ),        SLAP_RESTRICT_EXOP_WHOAMI },
+       { BER_BVC( LDAP_EXOP_CANCEL ),  SLAP_RESTRICT_EXOP_CANCEL },
        { BER_BVNULL,                           0 }
 };
 
@@ -373,7 +370,7 @@ monitor_subsys_database_init(
                        int             t;
 
                        for ( t = 0; t < mi->mi_ntargets; t++ ) {
-                               char            **urls = ldap_str2charray( mi->mi_targets[ t ].mt_uri, " " );
+                               char            **urls = ldap_str2charray( mi->mi_targets[ t ]->mt_uri, " " );
 
                                if ( urls != NULL ) {
                                        int             u;
@@ -467,12 +464,12 @@ monitor_subsys_database_init(
                                        return( -1 );
                                }
                                ber_str2bv( on->on_bi.bi_type, 0, 0, &bv );
-                               attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL );
+                               attr_merge_one( e_overlay, mi->mi_ad_monitoredInfo, &bv, NULL );
 
                                bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d,%s",
                                        j, ms_overlay->mss_dn.bv_val );
                                bv.bv_val = buf;
-                               attr_merge_normalize_one( e, slap_schema.si_ad_seeAlso,
+                               attr_merge_normalize_one( e_overlay, slap_schema.si_ad_seeAlso,
                                        &bv, NULL );
 
                                mp_overlay = monitor_entrypriv_create();