|
 |
dc8c34 |
From 3bb31d1888d0b07025a6095dd128349c4633012b Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Mon, 10 Feb 2014 17:53:45 -0800
|
|
|
dc8c34 |
Subject: [PATCH 162/225] Ticket #47693 - Environment variables are not passed
|
|
|
dc8c34 |
when DS is started via service
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description:
|
|
|
dc8c34 |
The previous commit 57199b34c9cbe4a703e537633fbe6beab9a94e81
|
|
|
dc8c34 |
contained a cherry-pick error.
|
|
|
dc8c34 |
Replaced CFG_ONOFF_LOCK_WRITE with CFG_LOCK_WRITE, and
|
|
|
dc8c34 |
CFG_ONOFF_UNLOCK_WRITE with CFG_UNLOCK_WRITE
|
|
|
dc8c34 |
(cherry picked from commit 98986b513ed0cf243fe43ce0e745828da680208f)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/libglobs.c | 12 ++++++------
|
|
|
dc8c34 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
|
|
|
dc8c34 |
index 903d38b..8103133 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/libglobs.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/libglobs.c
|
|
|
dc8c34 |
@@ -6676,9 +6676,9 @@ config_set_malloc_mxfast(const char *attrname, char *value, char *errorbuf, int
|
|
|
dc8c34 |
value, CONFIG_MALLOC_MXFAST, max);
|
|
|
dc8c34 |
return LDAP_OPERATIONS_ERROR;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
- CFG_ONOFF_LOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
+ CFG_LOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
slapdFrontendConfig->malloc_mxfast = mxfast;
|
|
|
dc8c34 |
- CFG_ONOFF_UNLOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
+ CFG_UNLOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
if ((mxfast >= 0) && (mxfast <= max)) {
|
|
|
dc8c34 |
mallopt(M_MXFAST, mxfast);
|
|
|
dc8c34 |
@@ -6719,9 +6719,9 @@ config_set_malloc_trim_threshold(const char *attrname, char *value, char *errorb
|
|
|
dc8c34 |
return LDAP_OPERATIONS_ERROR;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- CFG_ONOFF_LOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
+ CFG_LOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
slapdFrontendConfig->malloc_trim_threshold = trim_threshold;
|
|
|
dc8c34 |
- CFG_ONOFF_UNLOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
+ CFG_UNLOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
if (trim_threshold >= -1) {
|
|
|
dc8c34 |
mallopt(M_TRIM_THRESHOLD, trim_threshold);
|
|
|
dc8c34 |
@@ -6769,9 +6769,9 @@ config_set_malloc_mmap_threshold(const char *attrname, char *value, char *errorb
|
|
|
dc8c34 |
return LDAP_OPERATIONS_ERROR;
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- CFG_ONOFF_LOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
+ CFG_LOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
slapdFrontendConfig->malloc_mmap_threshold = mmap_threshold;
|
|
|
dc8c34 |
- CFG_ONOFF_UNLOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
+ CFG_UNLOCK_WRITE(slapdFrontendConfig);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
if ((mmap_threshold >= 0) && (mmap_threshold <= max)) {
|
|
|
dc8c34 |
mallopt(M_MMAP_THRESHOLD, mmap_threshold);
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|