From 1fb33c0e9fbe0446767d2cdad437016b227796c7 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 30 May 2006 11:34:36 +0000 Subject: [PATCH] Fix ARG_OFFSET to work with overlays --- servers/slapd/config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/slapd/config.c b/servers/slapd/config.c index ddfc2af581..ae8c5feb65 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -315,7 +315,8 @@ int config_set_vals(ConfigTable *Conf, ConfigArgs *c) { return(0); } if(arg_type & ARG_OFFSET) { - if (c->be) + if (c->be && (!overlay_is_over(c->be) || + ((slap_overinfo *)c->be->bd_info)->oi_orig == c->bi)) ptr = c->be->be_private; else if (c->bi) ptr = c->bi->bi_private; @@ -406,7 +407,8 @@ config_get_vals(ConfigTable *cf, ConfigArgs *c) if ( rc ) return rc; } else { if ( cf->arg_type & ARG_OFFSET ) { - if ( c->be ) + if (c->be && (!overlay_is_over(c->be) || + ((slap_overinfo *)c->be->bd_info)->oi_orig == c->bi)) ptr = c->be->be_private; else if ( c->bi ) ptr = c->bi->bi_private; -- 2.39.5