Commit 48c4a1fb authored by Ondřej Kuzník's avatar Ondřej Kuzník
Browse files

Merge branch 'its9870' into 'master'

ITS#9870 Drop optional overlay configuration option

See merge request !541
parents fbe844f8 5d985e01
Pipeline #4433 passed with stage
in 42 minutes and 47 seconds
......@@ -2905,17 +2905,8 @@ config_overlay(ConfigArgs *c) {
} else if ( c->op == LDAP_MOD_DELETE ) {
assert(0);
}
if(c->argv[1][0] == '-' && overlay_config(c->be, &c->argv[1][1],
c->valx, &c->bi, &c->reply)) {
/* log error */
Debug( LDAP_DEBUG_ANY,
"%s: (optional) %s overlay \"%s\" configuration failed.\n",
c->log, c->be == frontendDB ? "global " : "", &c->argv[1][1]);
return 1;
} else if(overlay_config(c->be, c->argv[1], c->valx, &c->bi, &c->reply)) {
return(1);
}
return(0);
return overlay_config( c->be, c->argv[1], c->valx, &c->bi, &c->reply );
}
static int
......
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