silence warning

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index b91bf6bb40ef7c23d90b7d4179ade58ddb0f5433..b446dcc4ca7ae7705e45f9979ecb8879ecca5b9d 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -78,7 +78,8 @@ static int fp_parse_line(ConfigArgs *c);
 
 static char    *strtok_quote(char *line, char *sep, char **quote_ptr);
 
-int read_config_file(const char *fname, int depth, ConfigArgs *cf);
+int read_config_file(const char *fname, int depth, ConfigArgs *cf,
+       ConfigTable *cft );
 
 ConfigArgs *
 new_config_args( BackendDB *be, const char *fname, int lineno, int argc, char **argv )
@@ -445,27 +446,25 @@ int
 init_config_ocs( ConfigOCs *ocs ) {
        int i;
 
-       for (i=0;ocs[i].def;i++) {
+       for (i=0;ocs[i].co_def;i++) {
                LDAPObjectClass *oc;
                int code;
                const char *err;
 
-               oc = ldap_str2objectclass( ocs[i].def, &code, &err,
+               oc = ldap_str2objectclass( ocs[i].co_def, &code, &err,
                        LDAP_SCHEMA_ALLOW_ALL );
                if ( !oc ) {
                        fprintf( stderr, "init_config_ocs: objectclass \"%s\": %s, %s\n",
-                               ocs[i].def, ldap_scherr2str(code), err );
+                               ocs[i].co_def, ldap_scherr2str(code), err );
                        return code;
                }
                code = oc_add(oc,0,NULL,&err);
                if ( code && code != SLAP_SCHERR_CLASS_DUP ) {
                        fprintf( stderr, "init_config_ocs: objectclass \"%s\": %s, %s\n",
-                               ocs[i].def, scherr2str(code), err );
+                               ocs[i].co_def, scherr2str(code), err );
                        return code;
                }
-               if ( ocs[i].oc ) {
-                       *ocs[i].oc = oc_find(oc->oc_names[0]);
-               }
+               ocs[i].co_oc = oc_find(oc->oc_names[0]);
                ldap_memfree(oc);
        }
        return 0;
@@ -513,7 +512,7 @@ config_parse_add(ConfigTable *ct, ConfigArgs *c)
 }
 
 int
-read_config_file(const char *fname, int depth, ConfigArgs *cf)
+read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
 {
        FILE *fp;
        ConfigTable *ct;
@@ -569,13 +568,20 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                }
 
                if ( c->argc < 1 ) {
-                       Debug(LDAP_DEBUG_CONFIG, "%s: bad config line (ignored)\n", c->log, 0, 0);
+                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: bad config line" 
+                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
+                               c->log, 0, 0);
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+                       rc = 1;
+                       goto leave;
+#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                        continue;
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                }
 
                c->op = SLAP_CONFIG_ADD;
 
-               ct = config_find_keyword( config_back_cf_table, c );
+               ct = config_find_keyword( cft, c );
                if ( ct ) {
                        rc = config_add_vals( ct, c );
                        if ( !rc ) continue;
@@ -592,10 +598,10 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                                goto leave;
                        }
                        
-               } else if ( c->bi ) {
+               } else if ( c->bi && !c->be ) {
                        rc = SLAP_CONF_UNKNOWN;
-                       if ( c->bi->bi_cf_table ) {
-                               ct = config_find_keyword( c->bi->bi_cf_table, c );
+                       if ( c->bi->bi_cf_ocs ) {
+                               ct = config_find_keyword( c->bi->bi_cf_ocs->co_table, c );
                                if ( ct ) {
                                        rc = config_add_vals( ct, c );
                                }
@@ -607,10 +613,13 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                        if ( rc ) {
                                switch(rc) {
                                case SLAP_CONF_UNKNOWN:
-                                       Debug(LDAP_DEBUG_CONFIG, "%s: "
-                                               "unknown directive <%s> inside backend info definition (ignored)\n",
+                                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
+                                               "unknown directive <%s> inside backend info definition"
+                                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                                                c->log, *c->argv, 0);
+#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
                                        continue;
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
                                        goto leave;
@@ -619,8 +628,8 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
 
                } else if ( c->be ) {
                        rc = SLAP_CONF_UNKNOWN;
-                       if ( c->be->be_cf_table ) {
-                               ct = config_find_keyword( c->be->be_cf_table, c );
+                       if ( c->be->be_cf_ocs ) {
+                               ct = config_find_keyword( c->be->be_cf_ocs->co_table, c );
                                if ( ct ) {
                                        rc = config_add_vals( ct, c );
                                }
@@ -632,11 +641,13 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                        if ( rc ) {
                                switch(rc) {
                                case SLAP_CONF_UNKNOWN:
-                                       Debug( LDAP_DEBUG_CONFIG, "%s: "
+                                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
                                                "unknown directive <%s> inside backend database "
-                                               "definition (ignored)\n",
+                                               "definition" SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                                                c->log, *c->argv, 0);
+#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
                                        continue;
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
                                        goto leave;
@@ -648,10 +659,13 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                        if ( rc ) {
                                switch(rc) {
                                case SLAP_CONF_UNKNOWN:
-                                       Debug( LDAP_DEBUG_CONFIG, "%s: "
-                                               "unknown directive <%s> inside global database definition (ignored)\n",
+                                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
+                                               "unknown directive <%s> inside global database definition"
+                                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                                                c->log, *c->argv, 0);
+#ifndef SLAPD_CONF_UNKNOWN_BAILOUT
                                        continue;
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
                                        goto leave;
@@ -659,26 +673,19 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf)
                        }
                        
                } else {
-                       Debug(LDAP_DEBUG_CONFIG, "%s: "
-                               "unknown directive <%s> outside backend info and database definitions (ignored)\n",
+                       Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: "
+                               "unknown directive <%s> outside backend info and database definitions"
+                               SLAPD_CONF_UNKNOWN_IGNORED ".\n",
                                c->log, *c->argv, 0);
+#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
+                       rc = 1;
+                       goto leave;
+#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                        continue;
-
+#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                }
        }
 
-       if ( BER_BVISNULL( &frontendDB->be_schemadn ) ) {
-               ber_str2bv( SLAPD_SCHEMA_DN, STRLENOF( SLAPD_SCHEMA_DN ), 1,
-                       &frontendDB->be_schemadn );
-               rc = dnNormalize( 0, NULL, NULL, &frontendDB->be_schemadn, &frontendDB->be_schemandn, NULL );
-               if ( rc != LDAP_SUCCESS ) {
-                       Debug(LDAP_DEBUG_ANY, "%s: "
-                               "unable to normalize default schema DN \"%s\"\n",
-                               c->log, frontendDB->be_schemadn.bv_val, 0 );
-                       /* must not happen */
-                       assert( 0 );
-               }
-       }
        rc = 0;
 
 leave:
@@ -712,6 +719,9 @@ verbs_to_mask(int argc, char *argv[], slap_verbmasks *v, slap_mask_t *m) {
        return(0);
 }
 
+/* Mask keywords that represent multiple bits should occur before single
+ * bit keywords in the verbmasks array.
+ */
 int
 mask_to_verbs(slap_verbmasks *v, slap_mask_t m, BerVarray *bva) {
        int i;
@@ -721,11 +731,28 @@ mask_to_verbs(slap_verbmasks *v, slap_mask_t m, BerVarray *bva) {
                if (!v[i].mask) continue;
                if (( m & v[i].mask ) == v[i].mask ) {
                        value_add_one( bva, &v[i].word );
+                       m ^= v[i].mask;
+                       if ( !m ) break;
                }
        }
        return 0;
 }
 
+int
+enum_to_verb(slap_verbmasks *v, slap_mask_t m, struct berval *bv) {
+       int i;
+
+       for (i=0; !BER_BVISNULL(&v[i].word); i++) {
+               if ( m == v[i].mask ) {
+                       if ( bv != NULL ) {
+                               *bv = v[i].word;
+                       }
+                       return i;
+               }
+       }
+       return -1;
+}
+
 static slap_verbmasks tlskey[] = {
        { BER_BVC("no"),        SB_TLS_OFF },
        { BER_BVC("yes"),       SB_TLS_ON },
@@ -734,9 +761,7 @@ static slap_verbmasks tlskey[] = {
 };
 
 static slap_verbmasks methkey[] = {
-#if 0
        { BER_BVC("none"),      LDAP_AUTH_NONE },
-#endif
        { BER_BVC("simple"),    LDAP_AUTH_SIMPLE },
 #ifdef HAVE_CYRUS_SASL
        { BER_BVC("sasl"),      LDAP_AUTH_SASL },
@@ -1135,7 +1160,7 @@ int config_generic_wrapper( Backend *be, const char *fname, int lineno,
        sprintf( c.log, "%s: line %lu", fname, lineno );
 
        rc = SLAP_CONF_UNKNOWN;
-       ct = config_find_keyword( be->be_cf_table, &c );
+       ct = config_find_keyword( be->be_cf_ocs->co_table, &c );
        if ( ct )
                rc = config_add_vals( ct, &c );
        return rc;