Commit 5e030341 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Last round of changes from HEAD

parent c4f388c0
......@@ -16,8 +16,8 @@ ol_package=OpenLDAP
ol_major=2
ol_minor=3
ol_patch=4
ol_api_inc=20303
ol_api_inc=20304
ol_api_current=0
ol_api_revision=3
ol_api_revision=4
ol_api_age=0
ol_release_date="2005/06/10"
......@@ -35,7 +35,7 @@ Specify the suffix of a database to attach as a subordinate to the root
database. The specified database must have already been configured. If the
optional \fBasync\fP keyword is supplied, searches against this database may
be spawned in a separate thread to run concurrently with other operations
(currently not implemented). If the optional \fBadvertise\fI flag
(currently not implemented). If the optional \fBadvertise\fP flag
is supplied, the naming context is advertised in the rootDSE.
.SH FILES
.TP
......
......@@ -648,8 +648,8 @@ static ConfigOCs cf_ocs[] = {
"NAME 'olcModuleList' "
"DESC 'OpenLDAP dynamic module info' "
"SUP olcConfig STRUCTURAL "
"MUST ( olcModulePath $ olcModuleLoad ) "
"MAY cn )", Cft_Module, NULL, cfAddModule },
"MAY ( cn $ olcModulePath $ olcModuleLoad ) )",
Cft_Module, NULL, cfAddModule },
#endif
{ NULL, 0, NULL }
};
......@@ -833,7 +833,8 @@ config_generic(ConfigArgs *c) {
break;
case CFG_MODPATH: {
ModPaths *mp = c->private;
value_add_one( &c->rvalue_vals, &mp->mp_path );
if ( !BER_BVISNULL( &mp->mp_path ))
value_add_one( &c->rvalue_vals, &mp->mp_path );
rc = c->rvalue_vals ? 0 : 1;
}
......@@ -1160,7 +1161,7 @@ config_generic(ConfigArgs *c) {
/* If we're just adding a module on an existing modpath,
* make sure we've selected the current path.
*/
if ( c->op == LDAP_MOD_ADD && modcur != c->private ) {
if ( c->op == LDAP_MOD_ADD && c->private && modcur != c->private ) {
modcur = c->private;
/* This should never fail */
if ( module_path( modcur->mp_path.bv_val )) {
......
This diff is collapsed.
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