Commit a6fb9629 authored by Howard Chu's avatar Howard Chu
Browse files

Cleanup ModulePath handling

parent afd3f7c5
...@@ -364,7 +364,7 @@ ConfigTable config_back_cf_table[] = { ...@@ -364,7 +364,7 @@ ConfigTable config_back_cf_table[] = {
ARG_IGNORED, NULL, ARG_IGNORED, NULL,
#endif #endif
"( OLcfgGlAt:31 NAME 'olcModulePath' " "( OLcfgGlAt:31 NAME 'olcModulePath' "
"SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )", NULL, NULL }, "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
{ "objectclass", "objectclass", 2, 0, 0, ARG_PAREN|ARG_MAGIC|CFG_OC|ARG_NO_DELETE|ARG_NO_INSERT, { "objectclass", "objectclass", 2, 0, 0, ARG_PAREN|ARG_MAGIC|CFG_OC|ARG_NO_DELETE|ARG_NO_INSERT,
&config_generic, "( OLcfgGlAt:32 NAME 'olcObjectClasses' " &config_generic, "( OLcfgGlAt:32 NAME 'olcObjectClasses' "
"DESC 'OpenLDAP object classes' " "DESC 'OpenLDAP object classes' "
...@@ -606,7 +606,7 @@ static ConfigOCs cf_ocs[] = { ...@@ -606,7 +606,7 @@ static ConfigOCs cf_ocs[] = {
"olcDisallows $ olcGentleHUP $ olcIdleTimeout $ " "olcDisallows $ olcGentleHUP $ olcIdleTimeout $ "
"olcIndexSubstrIfMaxLen $ olcIndexSubstrIfMinLen $ " "olcIndexSubstrIfMaxLen $ olcIndexSubstrIfMinLen $ "
"olcIndexSubstrAnyLen $ olcIndexSubstrAnyStep $ olcLocalSSF $ " "olcIndexSubstrAnyLen $ olcIndexSubstrAnyStep $ olcLocalSSF $ "
"olcLogLevel $ olcModulePath $ " "olcLogLevel $ "
"olcPasswordCryptSaltFormat $ olcPasswordHash $ olcPidFile $ " "olcPasswordCryptSaltFormat $ olcPasswordHash $ olcPidFile $ "
"olcPluginLogFile $ olcReadOnly $ olcReferral $ " "olcPluginLogFile $ olcReadOnly $ olcReferral $ "
"olcReplicaPidFile $ olcReplicaArgsFile $ olcReplicationInterval $ " "olcReplicaPidFile $ olcReplicaArgsFile $ olcReplicationInterval $ "
...@@ -661,7 +661,7 @@ static ConfigOCs cf_ocs[] = { ...@@ -661,7 +661,7 @@ static ConfigOCs cf_ocs[] = {
"NAME 'olcModuleList' " "NAME 'olcModuleList' "
"DESC 'OpenLDAP dynamic module info' " "DESC 'OpenLDAP dynamic module info' "
"SUP olcConfig STRUCTURAL " "SUP olcConfig STRUCTURAL "
"MUST olcModuleLoad " "MUST ( olcModulePath $ olcModuleLoad ) "
"MAY cn )", Cft_Module, &cfOc_module }, "MAY cn )", Cft_Module, &cfOc_module },
#endif #endif
{ NULL, 0, NULL } { NULL, 0, NULL }
...@@ -848,16 +848,9 @@ config_generic(ConfigArgs *c) { ...@@ -848,16 +848,9 @@ config_generic(ConfigArgs *c) {
} }
break; break;
case CFG_MODPATH: { case CFG_MODPATH: {
ModPaths *mp; ModPaths *mp = c->private;
for (i=0, mp=&modpaths; mp; mp=mp->mp_next, i++) { value_add_one( &c->rvalue_vals, &mp->mp_path );
struct berval bv;
if ( BER_BVISNULL( &mp->mp_path ) && !mp->mp_loads )
continue;
bv.bv_val = c->log;
bv.bv_len = sprintf( bv.bv_val, IFMT "%s", i,
mp->mp_path.bv_val );
value_add_one( &c->rvalue_vals, &bv );
}
rc = c->rvalue_vals ? 0 : 1; rc = c->rvalue_vals ? 0 : 1;
} }
break; break;
...@@ -2815,7 +2808,6 @@ count_ocs( Attribute *oc_at, int *nocs ) ...@@ -2815,7 +2808,6 @@ count_ocs( Attribute *oc_at, int *nocs )
return colst; return colst;
} }
/* Only the root can be Cft_Global, everything else must
/* Parse an LDAP entry into config directives */ /* Parse an LDAP entry into config directives */
static int static int
config_add_internal( CfBackInfo *cfb, Entry *e, SlapReply *rs, int *renum ) config_add_internal( CfBackInfo *cfb, Entry *e, SlapReply *rs, int *renum )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment