Blame 0099-Revert-fix-coverity-11915-dead-code-introduced-with-.patch
|
 |
dc8c34 |
From eedc572f10eb41550ef2097dfee6cab3f9afaec8 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 31 Jul 2013 13:25:00 -0600
|
|
|
dc8c34 |
Subject: [PATCH 99/99] Revert "fix coverity 11915 - dead code - introduced
|
|
|
dc8c34 |
with fix for ticket 346"
|
|
|
dc8c34 |
|
|
|
dc8c34 |
This reverts commit dc9192efc1c502e53e54291a8afda33f56a97d03.
|
|
|
dc8c34 |
(cherry picked from commit 6b1cdd506eecfe575fe248e25d498fd07d512736)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/attr.c | 3 ++-
|
|
|
dc8c34 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c
|
|
|
dc8c34 |
index ed6d8de..87dfe1e 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/attr.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/attr.c
|
|
|
dc8c34 |
@@ -767,6 +767,7 @@ attr_add_valuearray(Slapi_Attr *a, Slapi_Value **vals, const char *dn)
|
|
|
dc8c34 |
int i = 0;
|
|
|
dc8c34 |
int numofvals = 0;
|
|
|
dc8c34 |
int duplicate_index = -1;
|
|
|
dc8c34 |
+ int was_present_null = 0;
|
|
|
dc8c34 |
int rc = LDAP_SUCCESS;
|
|
|
dc8c34 |
|
|
|
dc8c34 |
if (valuearray_isempty(vals)) {
|
|
|
dc8c34 |
@@ -865,7 +866,7 @@ attr_add_valuearray(Slapi_Attr *a, Slapi_Value **vals, const char *dn)
|
|
|
dc8c34 |
duplicate_string,
|
|
|
dc8c34 |
a->a_type,
|
|
|
dc8c34 |
dn ? dn : "<null>",
|
|
|
dc8c34 |
- "value exists");
|
|
|
dc8c34 |
+ (was_present_null ? "duplicate new value" : "value exists"));
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
return( rc );
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|