|
 |
ba46c7 |
From ba632fde62d50cb2641010b29e6f11bf62862922 Mon Sep 17 00:00:00 2001
|
|
|
ba46c7 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
ba46c7 |
Date: Fri, 8 Nov 2013 13:58:14 -0800
|
|
|
ba46c7 |
Subject: [PATCH 46/49] Ticket #47589 - Winsync replica initialization and
|
|
|
ba46c7 |
incremental updates from DS to AD fails on RHEL7
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Bug description: Cherry-picking the fix for "Ticket #47492 - PassSync
|
|
|
ba46c7 |
removes User must change password flag on the Windows side" (commit
|
|
|
ba46c7 |
8d34f77f6d8d3c83dce1f29e6df709df1adef09d) dropped one line to set
|
|
|
ba46c7 |
suffix in map_entry_dn_outbound.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Fix description: This patch recovers the suffix setting code.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Reviewed by rmeggins (Thank you, Rich!)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
(cherry picked from commit 9df31ed14bf8c9e2224a21e0fc544fffec637a58)
|
|
|
ba46c7 |
---
|
|
|
ba46c7 |
ldap/servers/plugins/replication/windows_protocol_util.c | 2 +-
|
|
|
ba46c7 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
|
|
|
ba46c7 |
index 69db5a0..5559f7e 100644
|
|
|
ba46c7 |
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
|
|
|
ba46c7 |
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
|
|
|
ba46c7 |
@@ -3502,7 +3502,7 @@ map_entry_dn_outbound(Slapi_Entry *e,
|
|
|
ba46c7 |
char *guid = NULL;
|
|
|
ba46c7 |
Slapi_DN *new_dn = NULL;
|
|
|
ba46c7 |
int is_nt4 = windows_private_get_isnt4(prp->agmt);
|
|
|
ba46c7 |
- const char *suffix = NULL;
|
|
|
ba46c7 |
+ const char *suffix = slapi_sdn_get_dn(windows_private_get_windows_subtree(prp->agmt));
|
|
|
ba46c7 |
Slapi_Entry *remote_entry = NULL;
|
|
|
ba46c7 |
|
|
|
ba46c7 |
if (NULL == e) {
|
|
|
ba46c7 |
--
|
|
|
ba46c7 |
1.8.1.4
|
|
|
ba46c7 |
|