fix previous commit (ITS#5819)

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 6e20e6a09c28b9f734560bde3165a1a2c07de14b..a81ab852c9588e332dfc6463f5804af459c419c8 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -496,9 +496,6 @@ init_config_attrs(ConfigTable *ct) {
                        fprintf( stderr, "init_config_attrs: register_at failed\n" );
                        return code;
                }
-#ifndef LDAP_DEVEL
-               ct[i].ad->ad_type->sat_flags |= SLAP_AT_HIDE;
-#endif
        }
 
        return 0;
@@ -514,9 +511,6 @@ init_config_ocs( ConfigOCs *ocs ) {
                        fprintf( stderr, "init_config_ocs: register_oc failed\n" );
                        return code;
                }
-#ifndef LDAP_DEVEL
-               ocs[i].co_oc->soc_flags |= SLAP_OC_HIDE;
-#endif
        }
        return 0;
 }
@@ -1007,6 +1001,47 @@ enum_to_verb(slap_verbmasks *v, slap_mask_t m, struct berval *bv) {
        return -1;
 }
 
+/* register a new verbmask */
+static int
+slap_verbmask_register( slap_verbmasks *vm_, slap_verbmasks **vmp, struct berval *bv, int mask )
+{
+       slap_verbmasks  *vm = *vmp;
+       int             i;
+
+       /* check for duplicate word */
+       /* NOTE: we accept duplicate codes; the first occurrence will be used
+        * when mapping from mask to verb */
+       i = verb_to_mask( bv->bv_val, vm );
+       if ( !BER_BVISNULL( &vm[ i ].word ) ) {
+               return -1;
+       }
+
+       for ( i = 0; !BER_BVISNULL( &vm[ i ].word ); i++ )
+               ;
+
+       if ( vm == vm_ ) {
+               /* first time: duplicate array */
+               vm = ch_calloc( i + 2, sizeof( slap_verbmasks ) );
+               for ( i = 0; !BER_BVISNULL( &vm_[ i ].word ); i++ )
+               {
+                       ber_dupbv( &vm[ i ].word, &vm_[ i ].word );
+                       *((slap_mask_t*)&vm[ i ].mask) = vm_[ i ].mask;
+               }
+
+       } else {
+               vm = ch_realloc( vm, (i + 2) * sizeof( slap_verbmasks ) );
+       }
+
+       ber_dupbv( &vm[ i ].word, bv );
+       *((slap_mask_t*)&vm[ i ].mask) = mask;
+
+       BER_BVZERO( &vm[ i+1 ].word );
+
+       *vmp = vm;
+
+       return i;
+}
+
 static slap_verbmasks slap_ldap_response_code_[] = {
        { BER_BVC("success"),                           LDAP_SUCCESS },
 
@@ -1093,6 +1128,13 @@ static slap_verbmasks slap_ldap_response_code_[] = {
 
 slap_verbmasks *slap_ldap_response_code = slap_ldap_response_code_;
 
+int
+slap_ldap_response_code_register( struct berval *bv, int err )
+{
+       return slap_verbmask_register( slap_ldap_response_code_,
+               &slap_ldap_response_code, bv, err );
+}
+
 #ifdef HAVE_TLS
 static slap_verbmasks tlskey[] = {
        { BER_BVC("no"),        SB_TLS_OFF },
@@ -1354,19 +1396,18 @@ slap_cf_aux_table_unparse( void *src, struct berval *bv, slap_cf_aux_table *tab0
 int
 slap_tls_get_config( LDAP *ld, int opt, char **val )
 {
+#ifdef HAVE_TLS
        slap_verbmasks *keys;
        int i, ival;
 
        *val = NULL;
        switch( opt ) {
-#ifdef HAVE_TLS
        case LDAP_OPT_X_TLS_CRLCHECK:
                keys = crlkeys;
                break;
        case LDAP_OPT_X_TLS_REQUIRE_CERT:
                keys = vfykeys;
                break;
-#endif
        default:
                return -1;
        }
@@ -1377,6 +1418,7 @@ slap_tls_get_config( LDAP *ld, int opt, char **val )
                        return 0;
                }
        }
+#endif
        return -1;
 }
 
@@ -1942,7 +1984,7 @@ config_destroy( )
                if ( frontendDB->be_schemadn.bv_val )
                        free( frontendDB->be_schemadn.bv_val );
                if ( frontendDB->be_acl )
-                       acl_destroy( frontendDB->be_acl, NULL );
+                       acl_destroy( frontendDB->be_acl );
        }
        free( line );
        if ( slapd_args_file )