|
 |
dc8c34 |
From 2dd6692669017c97d488a511caafa39d994ed14a Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Tue, 2 Jul 2013 14:40:00 -0600
|
|
|
dc8c34 |
Subject: [PATCH 79/99] Ticket #47409 - allow setting db deadlock rejection
|
|
|
dc8c34 |
policy
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47409
|
|
|
dc8c34 |
Reviewed by: nhosoi (Thanks!)
|
|
|
dc8c34 |
Branch: 389-ds-base-1.2.11
|
|
|
dc8c34 |
Fix Description: Fix coverity CID 11893 (#1 of 1): Unsigned compared against 0 (NO_EFFECT)
|
|
|
dc8c34 |
val is u_int32_t which is never less than 0
|
|
|
dc8c34 |
Platforms tested: RHEL6 x86_64
|
|
|
dc8c34 |
Flag Day: no
|
|
|
dc8c34 |
Doc impact: yes - document new config parameter
|
|
|
dc8c34 |
(cherry picked from commit 989a30bb2d63ee6b9157a9eb6a3d2ff6828abc60)
|
|
|
dc8c34 |
(cherry picked from commit 75b9e42a6555073d902526c20a606d17fd11f967)
|
|
|
dc8c34 |
(cherry picked from commit 1baa10dd3c14c6cdc29aae5d114547df812b5c17)
|
|
|
dc8c34 |
(cherry picked from commit d1aef99989c498cde20fc311b05780702efee653)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/back-ldbm/ldbm_config.c | 2 +-
|
|
|
dc8c34 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
|
|
|
dc8c34 |
index 44ccf78..b713f73 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
|
|
|
dc8c34 |
@@ -1339,7 +1339,7 @@ static int ldbm_config_db_deadlock_policy_set(void *arg, void *value, char *erro
|
|
|
dc8c34 |
int retval = LDAP_SUCCESS;
|
|
|
dc8c34 |
u_int32_t val = (u_int32_t) ((uintptr_t)value);
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- if ((val < DB_LOCK_NORUN) || (val > DB_LOCK_YOUNGEST)) {
|
|
|
dc8c34 |
+ if (val > DB_LOCK_YOUNGEST) {
|
|
|
dc8c34 |
PR_snprintf(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
|
|
|
dc8c34 |
"Error: Invalid value for %s (%d). Must be between %d and %d inclusive",
|
|
|
dc8c34 |
CONFIG_DB_DEADLOCK_POLICY, val, DB_LOCK_DEFAULT, DB_LOCK_YOUNGEST);
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|