RFC 4511 calls for unavailableCriticalExtension to returned when

[openldap] / servers / slapd / back-ldap / init.c

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 7cf092b734ef76da9b8cfa37c4838cc676cb9e0f..3847bd0259d440519fcdf6c971e07edf90a5d8ca 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -151,9 +151,7 @@ ldap_back_db_init( Backend *be )
 
        be->be_cf_ocs = be->bd_info->bi_cf_ocs;
 
-#if 0  /* disable by now */
        rc = ldap_back_monitor_db_init( be );
-#endif
 
        return rc;
 }
@@ -208,13 +206,15 @@ ldap_back_db_open( BackendDB *be )
                }
        }
 
-#if 0  /* disable by now */
        /* monitor setup */
        rc = ldap_back_monitor_db_open( be );
        if ( rc != 0 ) {
+               /* ignore by now */
+               rc = 0;
+#if 0
                goto fail;
-       }
 #endif
+       }
 
        li->li_flags |= LDAP_BACK_F_ISOPEN;
 
@@ -248,11 +248,9 @@ ldap_back_db_close( Backend *be )
 {
        int             rc = 0;
 
-#if 0  /* disable by now */
        if ( be->be_private ) {
                rc = ldap_back_monitor_db_close( be );
        }
-#endif
 
        return rc;
 }
@@ -263,9 +261,7 @@ ldap_back_db_destroy( Backend *be )
        if ( be->be_private ) {
                ldapinfo_t      *li = ( ldapinfo_t * )be->be_private;
 
-#if 0  /* disable by now */
                (void)ldap_back_monitor_db_destroy( be );
-#endif
 
                ldap_pvt_thread_mutex_lock( &li->li_conninfo.lai_mutex );