From: Ralf Haferkamp <ralf@openldap.org>
Date: Thu, 10 Dec 2009 14:22:26 +0000 (+0000)
Subject: global limits can also be set in "cn=config" (more forITS#6428)
X-Git-Tag: ACLCHECK_0~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=414230c469cb5839fdad88f84fd8c920b4b40e68;p=openldap

global limits can also be set in "cn=config" (more forITS#6428)
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 483a798387..78ff127c56 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2261,9 +2261,13 @@ ok:
 		assert( ad != NULL );
 
 		CfEntryInfo *ce = c->ca_entry->e_private;
-		for ( ce=ce->ce_sibs ;ce;ce=ce->ce_sibs) {
+		if ( ce->ce_type == Cft_Global ){
+			ce = ce->ce_kids;
+		}
+		for (; ce; ce=ce->ce_sibs) {
 			Entry *dbe = ce->ce_entry;
-			if (! attr_find( dbe->e_attrs, ad ) ) {
+			if ( (ce->ce_type == Cft_Database) && (ce->ce_be != frontendDB)
+					&& (!attr_find(dbe->e_attrs, ad)) ) {
 				ce->ce_be->be_def_limit.lms_s_soft = lim->lms_s_soft;
 				ce->ce_be->be_def_limit.lms_s_hard = lim->lms_s_hard;
 				ce->ce_be->be_def_limit.lms_s_unchecked =lim->lms_s_unchecked;