allow pretty time form in quarantine string

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 77a10e78c8984185d400f530de9bf05128b48e62..2b96dae787ece38d173232d7e3b7d95b99572128 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -103,6 +103,11 @@ ldap_back_db_init( Backend *be )
                return -1;
        }
 
+       li->li_rebind_f = ldap_back_default_rebind;
+       li->li_urllist_f = ldap_back_default_urllist;
+       li->li_urllist_p = li;
+       ldap_pvt_thread_mutex_init( &li->li_uri_mutex );
+
        BER_BVZERO( &li->li_acl_authcID );
        BER_BVZERO( &li->li_acl_authcDN );
        BER_BVZERO( &li->li_acl_passwd );
@@ -195,19 +200,30 @@ ldap_back_db_open( BackendDB *be )
        }
 #endif /* SLAPD_MONITOR */
 
-       if ( li->li_flags & LDAP_BACK_F_SUPPORT_T_F_DISCOVER ) {
+       if ( LDAP_BACK_T_F_DISCOVER( li ) && !LDAP_BACK_T_F( li ) ) {
                int             rc;
 
-               li->li_flags &= ~LDAP_BACK_F_SUPPORT_T_F_DISCOVER;
-
                rc = slap_discover_feature( li->li_uri, li->li_version,
                                slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
                                LDAP_FEATURE_ABSOLUTE_FILTERS );
                if ( rc == LDAP_COMPARE_TRUE ) {
-                       li->li_flags |= LDAP_BACK_F_SUPPORT_T_F;
+                       li->li_flags |= LDAP_BACK_F_T_F;
                }
        }
 
+       if ( LDAP_BACK_CANCEL_DISCOVER( li ) && !LDAP_BACK_CANCEL( li ) ) {
+               int             rc;
+
+               rc = slap_discover_feature( li->li_uri, li->li_version,
+                               slap_schema.si_ad_supportedExtension->ad_cname.bv_val,
+                               LDAP_EXOP_CANCEL );
+               if ( rc == LDAP_COMPARE_TRUE ) {
+                       li->li_flags |= LDAP_BACK_F_CANCEL_EXOP;
+               }
+       }
+
+       li->li_flags |= LDAP_BACK_F_ISOPEN;
+
        return 0;
 }
 
@@ -301,9 +317,13 @@ ldap_back_db_destroy(
                        if ( li->li_conninfo.lai_tree ) {
                        avl_free( li->li_conninfo.lai_tree, ldap_back_conn_free );
                }
+               if ( LDAP_BACK_QUARANTINE( li ) ) {
+                       slap_retry_info_destroy( &li->li_quarantine );
+               }
 
                ldap_pvt_thread_mutex_unlock( &li->li_conninfo.lai_mutex );
                ldap_pvt_thread_mutex_destroy( &li->li_conninfo.lai_mutex );
+               ldap_pvt_thread_mutex_destroy( &li->li_uri_mutex );
        }
 
        ch_free( be->be_private );