|
 |
dc8c34 |
From 912114d3386ae33de3ddfc904b78c32dc5425565 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Thu, 10 Jul 2014 14:18:06 -0600
|
|
|
dc8c34 |
Subject: [PATCH 243/243] Ticket #47692 single valued attribute replicated ADD
|
|
|
dc8c34 |
does not work
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47692
|
|
|
dc8c34 |
Reviewed by: nhosoi (Thanks!)
|
|
|
dc8c34 |
Branch: 389-ds-base-1.2.11
|
|
|
dc8c34 |
Fix Description: Previous fix was incomplete - needed to move the
|
|
|
dc8c34 |
deleted attribute to the present attribute list.
|
|
|
dc8c34 |
Platforms tested: RHEL6 x86_64
|
|
|
dc8c34 |
Flag Day: no
|
|
|
dc8c34 |
Doc impact: no
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit 4b54366593e50d71239588343f532eab39ef56e0)
|
|
|
dc8c34 |
(cherry picked from commit 60d8bf9f77c298197e4c8ecee585f8a2e6c0457c)
|
|
|
dc8c34 |
(cherry picked from commit 45dcda2425a865bf529ad0c8423664091392b865)
|
|
|
dc8c34 |
(cherry picked from commit aead2be2a9cc5392713c7849c18a9bf218beb533)
|
|
|
dc8c34 |
(cherry picked from commit 1dbf87ae7e9203ffe5968994701bfc8b71605c8f)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/entrywsi.c | 2 ++
|
|
|
dc8c34 |
1 file changed, 2 insertions(+)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
|
|
|
dc8c34 |
index f184c7f..40fe39b 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/entrywsi.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/entrywsi.c
|
|
|
dc8c34 |
@@ -1184,6 +1184,8 @@ resolve_attribute_state_single_valued(Slapi_Entry *e, Slapi_Attr *a, int attribu
|
|
|
dc8c34 |
*/
|
|
|
dc8c34 |
/* just remove the deleted value */
|
|
|
dc8c34 |
entry_deleted_value_to_zapped_value(a,pending_value);
|
|
|
dc8c34 |
+ /* move the attribute to the present attributes list */
|
|
|
dc8c34 |
+ entry_deleted_attribute_to_present_attribute(e,a);
|
|
|
dc8c34 |
pending_value = NULL;
|
|
|
dc8c34 |
attr_set_deletion_csn(a,NULL);
|
|
|
dc8c34 |
return; /* we are done - we are keeping the present value */
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|