|
 |
f92ce9 |
From 832fb9a26af053e989e59e5bae0aabbc7d2943a7 Mon Sep 17 00:00:00 2001
|
|
|
f92ce9 |
From: Ludwig Krispenz <lkrispen@redhat.com>
|
|
|
f92ce9 |
Date: Mon, 6 Oct 2014 17:12:42 +0200
|
|
|
f92ce9 |
Subject: [PATCH 16/21] Ticket 47918 - result of dna_dn_is_shared_config is
|
|
|
f92ce9 |
incorrectly used
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Bug Description: dna_load_shared_servers() is called for all entries,
|
|
|
f92ce9 |
except the config entries
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Fix Description: revert the logic of the result of dna_dn_is_shared_config()
|
|
|
f92ce9 |
|
|
|
f92ce9 |
https://fedorahosted.org/389/ticket/47918
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Reviewed by: Mark, Thanks
|
|
|
f92ce9 |
|
|
|
f92ce9 |
(cherry picked from commit 8d9679194c945a6e0b06f6527fba6b4548d4844d)
|
|
|
f92ce9 |
---
|
|
|
f92ce9 |
ldap/servers/plugins/dna/dna.c | 2 +-
|
|
|
f92ce9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f92ce9 |
|
|
|
f92ce9 |
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
|
|
|
f92ce9 |
index b42150a..bc280a4 100644
|
|
|
f92ce9 |
--- a/ldap/servers/plugins/dna/dna.c
|
|
|
f92ce9 |
+++ b/ldap/servers/plugins/dna/dna.c
|
|
|
f92ce9 |
@@ -4163,7 +4163,7 @@ static int dna_config_check_post_op(Slapi_PBlock * pb)
|
|
|
f92ce9 |
if (dna_dn_is_config(dn)) {
|
|
|
f92ce9 |
dna_load_plugin_config(pb, 0);
|
|
|
f92ce9 |
}
|
|
|
f92ce9 |
- if(dna_dn_is_shared_config(pb, dn) == 0){
|
|
|
f92ce9 |
+ if(dna_dn_is_shared_config(pb, dn)){
|
|
|
f92ce9 |
dna_load_shared_servers();
|
|
|
f92ce9 |
}
|
|
|
f92ce9 |
}
|
|
|
f92ce9 |
--
|
|
|
f92ce9 |
1.9.3
|
|
|
f92ce9 |
|