ITS#4667 in connection_closing, release c_mutex to allow waiters

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 5ff1c3776b1f37974b0644b7f31338f619c30860..a9bacd0a6284947ddc296ee4923babd5040c5e21 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -509,6 +509,10 @@ init_config_attrs(ConfigTable *ct) {
                        fprintf( stderr, "init_config_attrs: AttributeType \"%s\": %s\n",
                                ct[i].attribute, err );
                        return code;
+               } else {
+#ifndef LDAP_DEVEL
+                       ct[i].ad->ad_type->sat_flags |= SLAP_AT_HIDE;
+#endif
                }
        }
 
@@ -539,10 +543,14 @@ init_config_ocs( ConfigOCs *ocs ) {
                        return code;
                }
                ocs[i].co_oc = oc_find(oc->oc_names[0]);
-               if ( code )
+               if ( code ) {
                        ldap_objectclass_free(oc);
-               else
+               } else {
                        ldap_memfree(oc);
+#ifndef LDAP_DEVEL
+                       ocs[i].co_oc->soc_flags |= SLAP_OC_HIDE;
+#endif
+               }
        }
        return 0;
 }
@@ -1154,7 +1162,7 @@ slap_cf_aux_table_parse( const char *word, void *dst, slap_cf_aux_table *tab0, L
 int
 slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0 )
 {
-       char buf[BUFSIZ], *ptr;
+       char buf[AC_LINE_MAX], *ptr;
        slap_cf_aux_table *tab;
        struct berval tmp;
 
@@ -1288,10 +1296,12 @@ void bindconf_free( slap_bindconf *bc ) {
                BER_BVZERO( &bc->sb_authzId );
        }
 #ifdef HAVE_TLS
+#if 0
        if ( bc->sb_tls_ctx ) {
                SSL_CTX_free( bc->sb_tls_ctx );
                bc->sb_tls_ctx = NULL;
        }
+#endif
        if ( bc->sb_tls_cert ) {
                ch_free( bc->sb_tls_cert );
                bc->sb_tls_cert = NULL;
@@ -1610,7 +1620,7 @@ strtok_quote( char *line, char *sep, char **quote_ptr )
        return( tmp );
 }
 
-static char    buf[BUFSIZ];
+static char    buf[AC_LINE_MAX];
 static char    *line;
 static size_t lmax, lcur;
 
@@ -1618,7 +1628,7 @@ static size_t lmax, lcur;
        do { \
                size_t len = strlen( buf ); \
                while ( lcur + len + 1 > lmax ) { \
-                       lmax += BUFSIZ; \
+                       lmax += AC_LINE_MAX; \
                        line = (char *) ch_realloc( line, lmax ); \
                } \
                strcpy( line + lcur, buf ); \