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 )
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;
}
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;
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;
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 );
}
} 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 );
}
}
}
- 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:
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 },
};
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 },
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;