From: Howard Chu <hyc@openldap.org>
Date: Thu, 7 Apr 2005 05:32:21 +0000 (+0000)
Subject: Ignore include file records when loading LDIF tree, their contents
X-Git-Tag: OPENLDAP_AC_BP~990
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=931d7f4a952d456b79717e317a83d27072d9f73d;p=openldap

Ignore include file records when loading LDIF tree, their contents
have already been incorporated into the LDIF.
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 3014e13c2d..0fe2f2b08e 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -3277,8 +3277,10 @@ config_add_internal( CfBackInfo *cfb, Entry *e, SlapReply *rs, int *renum )
 		break;
 
 	case Cft_Include:
-		if ( !rs )	/* ignored */
+		if ( !rs ) {
+			nocs = 0; /* ignored */
 			break;
+		}
 		type_ad = cfAd_include;
 		break;
 #ifdef SLAPD_MODULES