2 commits - ldap/servers
by Noriko Hosoi
ldap/servers/slapd/control.c | 4 ++--
ldap/servers/slapd/dn.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 383db4a27cc417c1708989d84cf0e4445936ae9f
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Feb 25 15:09:34 2014 -0800
Ticket 571 (dup 47361) - Empty control list causes LDAP protocol error is thrown
covscan Defect type: Compiler Warnings
2. 389-ds-base-1.3.1.6/ldap/servers/slapd/control.c:364:25:
warning - format '%d' expects argument of type 'int',
but argument 4 has type 'PRUint64' [-Wformat=]
Introduced by commit d695afb6a637432e880296d8552f466981c0796c
Fix: Replaced %d with % NSPRIu64
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
diff --git a/ldap/servers/slapd/control.c b/ldap/servers/slapd/control.c
index dbbf5b0..d97aa2f 100644
--- a/ldap/servers/slapd/control.c
+++ b/ldap/servers/slapd/control.c
@@ -366,8 +366,8 @@ get_ldapmessage_controls_ext(
slapi_pblock_set(pb, SLAPI_REQCONTROLS, NULL);
slapi_pblock_set(pb, SLAPI_MANAGEDSAIT, &ctrl_not_found);
slapi_pblock_set(pb, SLAPI_PWPOLICY, &ctrl_not_found);
- slapi_log_error(SLAPI_LOG_CONNS, "connection", "Warning: conn=%d op=%d contains an empty list of controls\n",
- (int)pb->pb_conn->c_connid, pb->pb_op->o_opid);
+ slapi_log_error(SLAPI_LOG_CONNS, "connection", "Warning: conn=%" NSPRIu64 " op=%d contains an empty list of controls\n",
+ (long long unsigned int)pb->pb_conn->c_connid, pb->pb_op->o_opid);
} else {
if ((tag != LBER_END_OF_SEQORSET) && (len != -1)) {
goto free_and_return;
commit 5ac08038a05877b4240755801debd5e5a3a94c6f
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Feb 25 14:33:48 2014 -0800
Ticket 408 - create a normalized dn cache
covscan Defect type: FORWARD_NULL
15. 389-ds-base-1.3.1.6/ldap/servers/slapd/dn.c:3036:var_deref_op -
Dereferencing null pointer "node".
Introduced by commit 1d6dd39fb8b0ef8eb42ec9ef8c3d325e27a3d3c1
Fix: Check if "node" is null or not before referencing.
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c
index 7515eee..51dcd99 100644
--- a/ldap/servers/slapd/dn.c
+++ b/ldap/servers/slapd/dn.c
@@ -3032,7 +3032,7 @@ ndn_cache_flush()
int i;
node = ndn_cache->tail;
- for(i = 0; i < NDN_FLUSH_COUNT && ndn_cache->cache_count > NDN_MIN_COUNT; i++){
+ for(i = 0; node && i < NDN_FLUSH_COUNT && ndn_cache->cache_count > NDN_MIN_COUNT; i++){
flush_node = node;
/* update the lru */
next = node->prev;
10 years, 2 months
Branch '389-ds-base-1.3.2' - ldap/servers
by thierry bordaz
ldap/servers/slapd/plugin.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 5bf85e607817dbd6e94571e41d6b8a0b23923d7b
Author: Thierry bordaz (tbordaz) <tbordaz(a)redhat.com>
Date: Wed Feb 19 17:03:03 2014 +0100
Ticket 47699: Propagate plugin precedence to all registered function types
Bug Description:
A plugin can define its nsslapd-pluginprecedence (config), that is number that order the
plugins in the plugin list.
If a plugin register an other plugin (slapi_register_plugin), this number is not
preserved in the new plugin and it gets a default plugin precedence value.
Fix Description:
When registering a plugin (slapi_register_plugin) a plugin identity is provided that
contains the original plugin configuration (with its precedence).
The fix consist to set (in slapi_register_plugin_ext ) the precedence to the
value store in the plugin identity. It is done in slapi_register_plugin_ext
because referencial integrity calls directly slapi_register_plugin_ext.
https://fedorahosted.org/389/ticket/47699
Reviewed by: Rich Megginson / Mark Reynolds
Platforms tested: F17
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 617909d..b13ecbb 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -268,6 +268,7 @@ slapi_register_plugin_ext(
)
{
int ii = 0;
+ int found_precedence;
int rc = 0;
Slapi_Entry *e = NULL;
char *dn = slapi_ch_smprintf("cn=%s,%s", name, PLUGIN_BASE_DN);
@@ -284,7 +285,21 @@ slapi_register_plugin_ext(
slapi_entry_attr_set_charptr(e, ATTR_PLUGIN_ENABLED, "off");
slapi_entry_attr_set_charptr(e, ATTR_PLUGIN_INITFN, initsymbol);
- slapi_entry_attr_set_int(e, ATTR_PLUGIN_PRECEDENCE, precedence);
+ /* If the plugin belong to a group, get the precedence from the group */
+ found_precedence = precedence;
+ if ((found_precedence == PLUGIN_DEFAULT_PRECEDENCE) && group_identity) {
+ struct slapi_componentid * cid = (struct slapi_componentid *) group_identity;
+ if (cid->sci_plugin &&
+ (cid->sci_plugin->plg_precedence != PLUGIN_DEFAULT_PRECEDENCE)) {
+ slapi_log_error(SLAPI_LOG_PLUGIN, NULL,
+ "Plugin precedence (%s) reset to group precedence (%s): %d \n",
+ name ? name : "",
+ cid->sci_plugin->plg_name ? cid->sci_plugin->plg_name : "",
+ cid->sci_plugin->plg_precedence);
+ found_precedence = cid->sci_plugin->plg_precedence;
+ }
+ }
+ slapi_entry_attr_set_int(e, ATTR_PLUGIN_PRECEDENCE, found_precedence);
for (ii = 0; argv && argv[ii]; ++ii) {
char argname[64];
10 years, 2 months
ldap/servers
by thierry bordaz
ldap/servers/slapd/plugin.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 272bd14ee0396d5cb02dd01b2ecbc294b16a8a7f
Author: Thierry bordaz (tbordaz) <tbordaz(a)redhat.com>
Date: Wed Feb 19 17:03:03 2014 +0100
Ticket 47699: Propagate plugin precedence to all registered function types
Bug Description:
A plugin can define its nsslapd-pluginprecedence (config), that is number that order the
plugins in the plugin list.
If a plugin register an other plugin (slapi_register_plugin), this number is not
preserved in the new plugin and it gets a default plugin precedence value.
Fix Description:
When registering a plugin (slapi_register_plugin) a plugin identity is provided that
contains the original plugin configuration (with its precedence).
The fix consist to set (in slapi_register_plugin_ext ) the precedence to the
value store in the plugin identity. It is done in slapi_register_plugin_ext
because referencial integrity calls directly slapi_register_plugin_ext.
https://fedorahosted.org/389/ticket/47699
Reviewed by: Rich Megginson / Mark Reynolds
Platforms tested: F17
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 617909d..b13ecbb 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -268,6 +268,7 @@ slapi_register_plugin_ext(
)
{
int ii = 0;
+ int found_precedence;
int rc = 0;
Slapi_Entry *e = NULL;
char *dn = slapi_ch_smprintf("cn=%s,%s", name, PLUGIN_BASE_DN);
@@ -284,7 +285,21 @@ slapi_register_plugin_ext(
slapi_entry_attr_set_charptr(e, ATTR_PLUGIN_ENABLED, "off");
slapi_entry_attr_set_charptr(e, ATTR_PLUGIN_INITFN, initsymbol);
- slapi_entry_attr_set_int(e, ATTR_PLUGIN_PRECEDENCE, precedence);
+ /* If the plugin belong to a group, get the precedence from the group */
+ found_precedence = precedence;
+ if ((found_precedence == PLUGIN_DEFAULT_PRECEDENCE) && group_identity) {
+ struct slapi_componentid * cid = (struct slapi_componentid *) group_identity;
+ if (cid->sci_plugin &&
+ (cid->sci_plugin->plg_precedence != PLUGIN_DEFAULT_PRECEDENCE)) {
+ slapi_log_error(SLAPI_LOG_PLUGIN, NULL,
+ "Plugin precedence (%s) reset to group precedence (%s): %d \n",
+ name ? name : "",
+ cid->sci_plugin->plg_name ? cid->sci_plugin->plg_name : "",
+ cid->sci_plugin->plg_precedence);
+ found_precedence = cid->sci_plugin->plg_precedence;
+ }
+ }
+ slapi_entry_attr_set_int(e, ATTR_PLUGIN_PRECEDENCE, found_precedence);
for (ii = 0; argv && argv[ii]; ++ii) {
char argname[64];
10 years, 2 months
Branch '389-ds-base-1.3.1' - ldap/servers
by Noriko Hosoi
ldap/servers/plugins/replication/repl5_replica_config.c | 24 ++++++++++------
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 4f9ec32b9904a359caf6a9c2f92f1c6e107727d4
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Feb 24 10:22:52 2014 -0800
Ticket 525 - Replication retry time attributes cannot be added
Description: Coverity CID 12434 Dereference before null check
introduced by commit dde9abef5ca71fc0557c66cabb99cb0a6f5e0332.
https://fedorahosted.org/389/ticket/525
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
(cherry picked from commit bbe0a9974c673336f42788cecaebdb46ddad03f4)
(cherry picked from commit 981c951cfc485f62f7207d42bcc563f0e50260e7)
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 4e5d4f1..9f08138 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -428,6 +428,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
else /* modify an attribute */
{
config_attr_value = (char *) mods[i]->mod_bvalues[0]->bv_val;
+ if (NULL == config_attr_value) {
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "attribute %s value is NULL.\n",
+ config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
+ errortext);
+ break;
+ }
if (strcasecmp (config_attr, attr_replicaBindDn) == 0)
{
@@ -467,7 +475,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaPurgeDelay) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value[0])
{
PRUint32 delay;
if (isdigit (config_attr_value[0]))
@@ -481,7 +489,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaTombstonePurgeInterval) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value[0])
{
long interval;
interval = atol (config_attr_value);
@@ -490,7 +498,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaLegacyConsumer) == 0)
{
- if (apply_mods)
+ if (apply_mods && config_attr_value[0])
{
PRBool legacy = (strcasecmp (config_attr_value, "on") == 0) ||
(strcasecmp (config_attr_value, "true") == 0) ||
@@ -511,15 +519,13 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
{
PRUint64 ptimeout = 0;
- if(config_attr_value){
- ptimeout = atoll(config_attr_value);
- }
+ ptimeout = atoll(config_attr_value);
if(ptimeout <= 0){
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
@@ -536,7 +542,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
@@ -553,7 +559,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
10 years, 2 months
Branch '389-ds-base-1.3.2' - ldap/servers
by Noriko Hosoi
ldap/servers/plugins/replication/repl5_replica_config.c | 24 ++++++++++------
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 981c951cfc485f62f7207d42bcc563f0e50260e7
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Feb 24 10:22:52 2014 -0800
Ticket 525 - Replication retry time attributes cannot be added
Description: Coverity CID 12434 Dereference before null check
introduced by commit dde9abef5ca71fc0557c66cabb99cb0a6f5e0332.
https://fedorahosted.org/389/ticket/525
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
(cherry picked from commit bbe0a9974c673336f42788cecaebdb46ddad03f4)
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 9696134..88f1e9a 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -429,6 +429,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
else /* modify an attribute */
{
config_attr_value = (char *) mods[i]->mod_bvalues[0]->bv_val;
+ if (NULL == config_attr_value) {
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "attribute %s value is NULL.\n",
+ config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
+ errortext);
+ break;
+ }
if (strcasecmp (config_attr, attr_replicaBindDn) == 0)
{
@@ -468,7 +476,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaPurgeDelay) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value[0])
{
PRUint32 delay;
if (isdigit (config_attr_value[0]))
@@ -482,7 +490,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaTombstonePurgeInterval) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value[0])
{
long interval;
interval = atol (config_attr_value);
@@ -491,7 +499,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaLegacyConsumer) == 0)
{
- if (apply_mods)
+ if (apply_mods && config_attr_value[0])
{
PRBool legacy = (strcasecmp (config_attr_value, "on") == 0) ||
(strcasecmp (config_attr_value, "true") == 0) ||
@@ -512,15 +520,13 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
{
PRUint64 ptimeout = 0;
- if(config_attr_value){
- ptimeout = atoll(config_attr_value);
- }
+ ptimeout = atoll(config_attr_value);
if(ptimeout <= 0){
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
@@ -537,7 +543,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
@@ -554,7 +560,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
10 years, 2 months
ldap/servers
by Noriko Hosoi
ldap/servers/plugins/replication/repl5_replica_config.c | 24 ++++++++++------
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit bbe0a9974c673336f42788cecaebdb46ddad03f4
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Feb 24 09:39:23 2014 -0800
Ticket 525 - Replication retry time attributes cannot be added
Description: Coverity CID 12434 Dereference before null check
introduced by commit dde9abef5ca71fc0557c66cabb99cb0a6f5e0332.
https://fedorahosted.org/389/ticket/525
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index b1c700e..ae4a7d8 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -429,6 +429,14 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
else /* modify an attribute */
{
config_attr_value = (char *) mods[i]->mod_bvalues[0]->bv_val;
+ if (NULL == config_attr_value) {
+ *returncode = LDAP_UNWILLING_TO_PERFORM;
+ PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE, "attribute %s value is NULL.\n",
+ config_attr);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n",
+ errortext);
+ break;
+ }
if (strcasecmp (config_attr, attr_replicaBindDn) == 0)
{
@@ -468,7 +476,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaPurgeDelay) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value[0])
{
PRUint32 delay;
if (isdigit (config_attr_value[0]))
@@ -482,7 +490,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaTombstonePurgeInterval) == 0)
{
- if (apply_mods && config_attr_value && config_attr_value[0])
+ if (apply_mods && config_attr_value[0])
{
long interval;
interval = atol (config_attr_value);
@@ -491,7 +499,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
}
else if (strcasecmp (config_attr, type_replicaLegacyConsumer) == 0)
{
- if (apply_mods)
+ if (apply_mods && config_attr_value[0])
{
PRBool legacy = (strcasecmp (config_attr_value, "on") == 0) ||
(strcasecmp (config_attr_value, "true") == 0) ||
@@ -512,15 +520,13 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
{
PRUint64 ptimeout = 0;
- if(config_attr_value){
- ptimeout = atoll(config_attr_value);
- }
+ ptimeout = atoll(config_attr_value);
if(ptimeout <= 0){
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
@@ -537,7 +543,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
@@ -554,7 +560,7 @@ replica_config_modify (Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry*
*returncode = LDAP_UNWILLING_TO_PERFORM;
PR_snprintf (errortext, SLAPI_DSE_RETURNTEXT_SIZE,
"attribute %s value (%s) is invalid, must be a number greater than zero.\n",
- config_attr, config_attr_value ? config_attr_value : "");
+ config_attr, config_attr_value);
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "replica_config_modify: %s\n", errortext);
break;
}
10 years, 2 months
ldap/servers
by Noriko Hosoi
ldap/servers/plugins/retrocl/retrocl_trim.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cd354191bc08c4eeb1a0222217777f122d726439
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Feb 24 09:11:37 2014 -0800
Ticket #47701 - Make retro changelog trim interval programmable
Description: Fixing resource leak CID 12435 (Coverity) introduced
by commit bb4f0c428f9e53bccb875a552f5cae1ee6f733be
https://fedorahosted.org/389/ticket/47701
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c
index cb18889..4d17377 100644
--- a/ldap/servers/plugins/retrocl/retrocl_trim.c
+++ b/ldap/servers/plugins/retrocl/retrocl_trim.c
@@ -499,7 +499,6 @@ void retrocl_init_trimming (void)
const char *cl_trim_interval;
cl_maxage = retrocl_get_config_str(CONFIG_CHANGELOG_MAXAGE_ATTRIBUTE);
- cl_trim_interval = retrocl_get_config_str(CONFIG_CHANGELOG_TRIM_INTERVAL);
if (cl_maxage == NULL) {
LDAPDebug0Args(LDAP_DEBUG_TRACE,"No maxage, not trimming retro changelog.\n");
@@ -508,6 +507,7 @@ void retrocl_init_trimming (void)
ageval = age_str2time (cl_maxage);
slapi_ch_free_string((char **)&cl_maxage);
+ cl_trim_interval = retrocl_get_config_str(CONFIG_CHANGELOG_TRIM_INTERVAL);
if (cl_trim_interval) {
trim_interval = strtol(cl_trim_interval, (char **)NULL, 10);
if (0 == trim_interval) {
10 years, 2 months
Branch '389-ds-base-1.3.1' - rpm/389-ds-base.spec.in
by Noriko Hosoi
rpm/389-ds-base.spec.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d6a57ad5d520227b1c7b464f76f021a2fbdae55d
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Feb 21 17:43:55 2014 -0800
Ticket #47709 - package issue in 389-ds-base
Description: Added arch aware python dir; moved libns-dshttpd.so* to
devel and libs package.
(cherry picked from commit f7c5dc2b9b7fb9bc0b836322565218b53953bb7b)
(cherry picked from commit c3cc56b75830b419b882610f1b1a743922a74458)
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 5d05f91..90858bf 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -288,8 +288,8 @@ fi
%{_unitdir}
%{_bindir}/*
%{_sbindir}/*
-%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
+%{_libdir}/%{pkgname}/python
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
%dir %{_localstatedir}/lib/%{pkgname}
@@ -310,6 +310,7 @@ fi
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%dir %{_libdir}/%{pkgname}
%{_libdir}/%{pkgname}/libslapd.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%changelog
* Thu Mar 28 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0.5-1
10 years, 2 months
Branch '389-ds-base-1.3.2' - rpm/389-ds-base.spec.in
by Noriko Hosoi
rpm/389-ds-base.spec.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c3cc56b75830b419b882610f1b1a743922a74458
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Feb 21 17:43:55 2014 -0800
Ticket #47709 - package issue in 389-ds-base
Description: Added arch aware python dir; moved libns-dshttpd.so* to
devel and libs package.
(cherry picked from commit f7c5dc2b9b7fb9bc0b836322565218b53953bb7b)
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 3b00556..af9244a 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -291,8 +291,8 @@ fi
%{_unitdir}
%{_bindir}/*
%{_sbindir}/*
-%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
+%{_libdir}/%{pkgname}/python
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
%dir %{_localstatedir}/lib/%{pkgname}
@@ -313,6 +313,7 @@ fi
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%dir %{_libdir}/%{pkgname}
%{_libdir}/%{pkgname}/libslapd.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%changelog
* Sat Jun 15 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.1.2-1
10 years, 2 months
rpm/389-ds-base.spec.in
by Noriko Hosoi
rpm/389-ds-base.spec.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f7c5dc2b9b7fb9bc0b836322565218b53953bb7b
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Feb 21 17:43:55 2014 -0800
Ticket #47709 - package issue in 389-ds-base
Description: Added arch aware python dir; moved libns-dshttpd.so* to
devel and libs package.
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 3b00556..af9244a 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -291,8 +291,8 @@ fi
%{_unitdir}
%{_bindir}/*
%{_sbindir}/*
-%{_libdir}/%{pkgname}/libns-dshttpd.so*
%{_libdir}/%{pkgname}/perl
+%{_libdir}/%{pkgname}/python
%dir %{_libdir}/%{pkgname}/plugins
%{_libdir}/%{pkgname}/plugins/*.so
%dir %{_localstatedir}/lib/%{pkgname}
@@ -313,6 +313,7 @@ fi
%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel
%dir %{_libdir}/%{pkgname}
%{_libdir}/%{pkgname}/libslapd.so.*
+%{_libdir}/%{pkgname}/libns-dshttpd.so*
%changelog
* Sat Jun 15 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.1.2-1
10 years, 2 months