forked from pool/openldap2
06a856973e
could cause the server to fail to start or to spin in an endless loop (bnc#558059,ITS#6408) - default the tls_reqcert parameter of a syncrepl config to "demand" as documented even if other tls_ options are absent (bnc#558397, ITS#6319) - apply changes to the global size and timelimits to all database that don't specify limits themself. (bnc#562184, ITS#6428) OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=25
136 lines
4.1 KiB
Plaintext
136 lines
4.1 KiB
Plaintext
From ed86ffeec8ac01f9bc8ed531e5205a924c4a2979 Mon Sep 17 00:00:00 2001
|
|
From: ralf <ralf>
|
|
Date: Thu, 10 Dec 2009 10:56:52 +0000
|
|
Subject: [PATCH 3/3] apply global limit changes to all databases (ITS#6428)
|
|
|
|
bnc#562184
|
|
---
|
|
servers/slapd/bconfig.c | 90 ++++++++++++++++++++++++++++++++++++++++------
|
|
1 files changed, 78 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
|
|
index d43e927..ae15224 100644
|
|
--- a/servers/slapd/bconfig.c
|
|
+++ b/servers/slapd/bconfig.c
|
|
@@ -2208,14 +2208,23 @@ config_sizelimit(ConfigArgs *c) {
|
|
rc = 1;
|
|
return rc;
|
|
} else if ( c->op == LDAP_MOD_DELETE ) {
|
|
- /* Reset to defaults */
|
|
- lim->lms_s_soft = SLAPD_DEFAULT_SIZELIMIT;
|
|
- lim->lms_s_hard = 0;
|
|
- lim->lms_s_unchecked = -1;
|
|
- lim->lms_s_pr = 0;
|
|
- lim->lms_s_pr_hide = 0;
|
|
- lim->lms_s_pr_total = 0;
|
|
- return 0;
|
|
+ /* Reset to defaults or values from frontend */
|
|
+ if ( c->be == frontendDB ) {
|
|
+ lim->lms_s_soft = SLAPD_DEFAULT_SIZELIMIT;
|
|
+ lim->lms_s_hard = 0;
|
|
+ lim->lms_s_unchecked = -1;
|
|
+ lim->lms_s_pr = 0;
|
|
+ lim->lms_s_pr_hide = 0;
|
|
+ lim->lms_s_pr_total = 0;
|
|
+ } else {
|
|
+ lim->lms_s_soft = frontendDB->be_def_limit.lms_s_soft;
|
|
+ lim->lms_s_hard = frontendDB->be_def_limit.lms_s_hard;
|
|
+ lim->lms_s_unchecked = frontendDB->be_def_limit.lms_s_unchecked;
|
|
+ lim->lms_s_pr = frontendDB->be_def_limit.lms_s_pr;
|
|
+ lim->lms_s_pr_hide = frontendDB->be_def_limit.lms_s_pr_hide;
|
|
+ lim->lms_s_pr_total = frontendDB->be_def_limit.lms_s_pr_total;
|
|
+ }
|
|
+ goto ok;
|
|
}
|
|
for(i = 1; i < c->argc; i++) {
|
|
if(!strncasecmp(c->argv[i], "size", 4)) {
|
|
@@ -2240,6 +2249,34 @@ config_sizelimit(ConfigArgs *c) {
|
|
lim->lms_s_hard = 0;
|
|
}
|
|
}
|
|
+
|
|
+ok:
|
|
+ if ( ( c->be == frontendDB ) && ( c->ca_entry ) ) {
|
|
+ /* This is a modification to the global limits apply it to
|
|
+ * the other databases as needed */
|
|
+ AttributeDescription *ad=NULL;
|
|
+ const char *text = NULL;
|
|
+ slap_str2ad(c->argv[0], &ad, &text);
|
|
+ /* if we got here... */
|
|
+ assert( ad != NULL );
|
|
+
|
|
+ CfEntryInfo *ce = c->ca_entry->e_private;
|
|
+ if ( ce->ce_type == Cft_Global ){
|
|
+ ce = ce->ce_kids;
|
|
+ }
|
|
+ for (; ce; ce=ce->ce_sibs) {
|
|
+ Entry *dbe = ce->ce_entry;
|
|
+ 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;
|
|
+ ce->ce_be->be_def_limit.lms_s_pr =lim->lms_s_pr;
|
|
+ ce->ce_be->be_def_limit.lms_s_pr_hide =lim->lms_s_pr_hide;
|
|
+ ce->ce_be->be_def_limit.lms_s_pr_total =lim->lms_s_pr_total;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
return(0);
|
|
}
|
|
|
|
@@ -2259,10 +2296,15 @@ config_timelimit(ConfigArgs *c) {
|
|
rc = 1;
|
|
return rc;
|
|
} else if ( c->op == LDAP_MOD_DELETE ) {
|
|
- /* Reset to defaults */
|
|
- lim->lms_t_soft = SLAPD_DEFAULT_TIMELIMIT;
|
|
- lim->lms_t_hard = 0;
|
|
- return 0;
|
|
+ /* Reset to defaults or values from frontend */
|
|
+ if ( c->be == frontendDB ) {
|
|
+ lim->lms_t_soft = SLAPD_DEFAULT_TIMELIMIT;
|
|
+ lim->lms_t_hard = 0;
|
|
+ } else {
|
|
+ lim->lms_t_soft = frontendDB->be_def_limit.lms_t_soft;
|
|
+ lim->lms_t_hard = frontendDB->be_def_limit.lms_t_hard;
|
|
+ }
|
|
+ goto ok;
|
|
}
|
|
for(i = 1; i < c->argc; i++) {
|
|
if(!strncasecmp(c->argv[i], "time", 4)) {
|
|
@@ -2287,6 +2329,30 @@ config_timelimit(ConfigArgs *c) {
|
|
lim->lms_t_hard = 0;
|
|
}
|
|
}
|
|
+
|
|
+ok:
|
|
+ if ( ( c->be == frontendDB ) && ( c->ca_entry ) ) {
|
|
+ /* This is a modification to the global limits apply it to
|
|
+ * the other databases as needed */
|
|
+ AttributeDescription *ad=NULL;
|
|
+ const char *text = NULL;
|
|
+ slap_str2ad(c->argv[0], &ad, &text);
|
|
+ /* if we got here... */
|
|
+ assert( ad != NULL );
|
|
+
|
|
+ CfEntryInfo *ce = c->ca_entry->e_private;
|
|
+ if ( ce->ce_type == Cft_Global ){
|
|
+ ce = ce->ce_kids;
|
|
+ }
|
|
+ for (; ce; ce=ce->ce_sibs) {
|
|
+ Entry *dbe = ce->ce_entry;
|
|
+ if ( (ce->ce_type == Cft_Database) && (ce->ce_be != frontendDB)
|
|
+ && (!attr_find(dbe->e_attrs, ad)) ) {
|
|
+ ce->ce_be->be_def_limit.lms_t_soft = lim->lms_t_soft;
|
|
+ ce->ce_be->be_def_limit.lms_t_hard = lim->lms_t_hard;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
return(0);
|
|
}
|
|
|
|
--
|
|
1.6.4.2
|
|
|