From: Howard Chu <hyc@openldap.org>
Date: Tue, 24 Apr 2007 11:40:13 +0000 (+0000)
Subject: Part of ITS#4921, don't create schema nodes for arbitrary include files
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7f19ad15859ef3e146cecbb6adf6aa22a4bce912;p=openldap

Part of ITS#4921, don't create schema nodes for arbitrary include files
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 4246489e1d..ba59508450 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -4284,7 +4284,10 @@ config_build_schema_inc( ConfigArgs *c, CfEntryInfo *ceparent,
 	struct berval bv;
 
 	for (; cf; cf=cf->c_sibs, c->depth++) {
+		if ( !cf->c_at_head && !cf->c_cr_head && !cf->c_oc_head &&
+			!cf->c_om_head ) continue;
 		c->value_dn.bv_val = c->log;
+		LUTIL_SLASHPATH( cf->c_file.bv_val );
 		bv.bv_val = strrchr(cf->c_file.bv_val, LDAP_DIRSEP[0]);
 		if ( !bv.bv_val ) {
 			bv = cf->c_file;