|
|
dc8c34 |
From 8901408e45c35dafa18b843b9db2f3114dd12b63 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Sun, 17 Aug 2014 15:10:16 -0700
|
|
|
dc8c34 |
Subject: [PATCH 248/251] Trac Ticket #443 - Deleting attribute present in
|
|
|
dc8c34 |
nsslapd-allowed-to-delete-attrs returns Operations error
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: Backporting the patch to 1.2.11 branch by commit
|
|
|
dc8c34 |
9cc7fade0b5440479b39ddbcb989e5ed220b267f accidentally removed
|
|
|
dc8c34 |
5 config parameters from the table:
|
|
|
dc8c34 |
CONFIG_LISTEN_BACKLOG_SIZE, CONFIG_MALLOC_MXFAST,
|
|
|
dc8c34 |
CONFIG_MALLOC_TRIM_THRESHOLD, CONFIG_MALLOC_MMAP_THRESHOLD,
|
|
|
dc8c34 |
CONFIG_IGNORE_TIME_SKEW
|
|
|
dc8c34 |
Resurrecting them.
|
|
|
dc8c34 |
(cherry picked from commit 06dfa1df69ebba9c71471d6e0de42ee09824302f)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/libglobs.c | 25 +++++++++++++++++++++++++
|
|
|
dc8c34 |
1 file changed, 25 insertions(+)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
|
|
|
dc8c34 |
index 5eda0f8..ad02a00 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/libglobs.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/libglobs.c
|
|
|
dc8c34 |
@@ -1008,6 +1008,31 @@ static struct config_get_and_set {
|
|
|
dc8c34 |
(void**)&global_slapdFrontendConfig.sasl_max_bufsize,
|
|
|
dc8c34 |
CONFIG_INT, (ConfigGetFunc)config_get_sasl_maxbufsize,
|
|
|
dc8c34 |
DEFAULT_SASL_MAXBUFSIZE},
|
|
|
dc8c34 |
+ {CONFIG_LISTEN_BACKLOG_SIZE, config_set_listen_backlog_size,
|
|
|
dc8c34 |
+ NULL, 0,
|
|
|
dc8c34 |
+ (void**)&global_slapdFrontendConfig.listen_backlog_size, CONFIG_INT,
|
|
|
dc8c34 |
+ (ConfigGetFunc)config_get_listen_backlog_size, &init_listen_backlog_size},
|
|
|
dc8c34 |
+#if defined(LINUX)
|
|
|
dc8c34 |
+ {CONFIG_MALLOC_MXFAST, config_set_malloc_mxfast,
|
|
|
dc8c34 |
+ NULL, 0,
|
|
|
dc8c34 |
+ (void**)&global_slapdFrontendConfig.malloc_mxfast,
|
|
|
dc8c34 |
+ CONFIG_INT, (ConfigGetFunc)config_get_malloc_mxfast,
|
|
|
dc8c34 |
+ &init_malloc_mxfast},
|
|
|
dc8c34 |
+ {CONFIG_MALLOC_TRIM_THRESHOLD, config_set_malloc_trim_threshold,
|
|
|
dc8c34 |
+ NULL, 0,
|
|
|
dc8c34 |
+ (void**)&global_slapdFrontendConfig.malloc_trim_threshold,
|
|
|
dc8c34 |
+ CONFIG_INT, (ConfigGetFunc)config_get_malloc_trim_threshold,
|
|
|
dc8c34 |
+ &init_malloc_trim_threshold},
|
|
|
dc8c34 |
+ {CONFIG_MALLOC_MMAP_THRESHOLD, config_set_malloc_mmap_threshold,
|
|
|
dc8c34 |
+ NULL, 0,
|
|
|
dc8c34 |
+ (void**)&global_slapdFrontendConfig.malloc_mmap_threshold,
|
|
|
dc8c34 |
+ CONFIG_INT, (ConfigGetFunc)config_get_malloc_mmap_threshold,
|
|
|
dc8c34 |
+ &init_malloc_mmap_threshold},
|
|
|
dc8c34 |
+#endif
|
|
|
dc8c34 |
+ {CONFIG_IGNORE_TIME_SKEW, config_set_ignore_time_skew,
|
|
|
dc8c34 |
+ NULL, 0,
|
|
|
dc8c34 |
+ (void**)&global_slapdFrontendConfig.ignore_time_skew,
|
|
|
dc8c34 |
+ CONFIG_ON_OFF, (ConfigGetFunc)config_get_ignore_time_skew, &init_ignore_time_skew}
|
|
|
dc8c34 |
#ifdef MEMPOOL_EXPERIMENTAL
|
|
|
dc8c34 |
,{CONFIG_MEMPOOL_SWITCH_ATTRIBUTE, config_set_mempool_switch,
|
|
|
dc8c34 |
NULL, 0,
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|