fix minor error message

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

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 9ea98fb72f08a0201629ac29a2dd71a1994ebc14..21d381c518e884ae89f268d3b0fed6b02c2fb65d 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -381,9 +381,7 @@ static slap_cf_aux_table timeout_table[] = {
        { BER_BVC("modrdn="),   SLAP_OP_MODRDN * sizeof( time_t ),      'u', 0, NULL },
        { BER_BVC("modify="),   SLAP_OP_MODIFY * sizeof( time_t ),      'u', 0, NULL },
        { BER_BVC("compare="),  SLAP_OP_COMPARE * sizeof( time_t ),     'u', 0, NULL },
-#if 0  /* uses timelimit instead */
        { BER_BVC("search="),   SLAP_OP_SEARCH * sizeof( time_t ),      'u', 0, NULL },
-#endif
        /* abandon makes little sense */
 #if 0  /* not implemented yet */
        { BER_BVC("extended="), SLAP_OP_EXTENDED * sizeof( time_t ),    'u', 0, NULL },
@@ -552,7 +550,6 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
        int             rc;
 
        if ( strcmp( c->argv[ 1 ], "*" ) == 0
-               || strcmp( c->argv[ 1 ], ".*" ) == 0
                || strcmp( c->argv[ 1 ], "dn:*" ) == 0
                || strcasecmp( c->argv[ 1 ], "dn.regex:.*" ) == 0 )
        {
@@ -1233,6 +1230,7 @@ ldap_back_cf_gen( ConfigArgs *c )
                        slap_retry_info_destroy( &li->li_quarantine );
                        ldap_pvt_thread_mutex_destroy( &li->li_quarantine_mutex );
                        li->li_isquarantined = 0;
+                       li->li_flags &= ~LDAP_BACK_F_QUARANTINE;
                        break;
 
                default:
@@ -1396,7 +1394,7 @@ done_url:;
                }
                li->li_flags &= ~LDAP_BACK_F_TLS_MASK;
                li->li_flags |= tls_mode[i].mask;
-               if ( c->argc > 3 ) {
+               if ( c->argc > 2 ) {
                        for ( i=2; i<c->argc; i++ ) {
                                if ( bindconf_tls_parse( c->argv[i], &li->li_tls ))
                                        return 1;
@@ -1652,8 +1650,8 @@ done_url:;
 
                        if ( li->li_uri == NULL ) {
                                snprintf( c->msg, sizeof( c->msg ),
-                                       "need URI to discover \"cancel\" support "
-                                       "in \"cancel exop-discover\"" );
+                                       "need URI to discover absolute filters support "
+                                       "in \"t-f-support discover\"" );
                                Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
                                return 1;
                        }
@@ -1864,6 +1862,7 @@ done_url:;
                        /* give it a chance to retry if the pattern gets reset
                         * via back-config */
                        li->li_isquarantined = 0;
+                       li->li_flags |= LDAP_BACK_F_QUARANTINE;
                }
                break;
 
@@ -2007,7 +2006,7 @@ retry:
                }
 
                if ( lc != NULL ) {
-                       ldap_back_release_conn( &op2, rs, lc );
+                       ldap_back_release_conn( (ldapinfo_t *)op2.o_bd->be_private, lc );
                }
 
        } else {