pgreco / rpms / ipa

Forked from forks/areguera/rpms/ipa 4 years ago
Clone
Blob Blame History Raw
From 2f3c2538595664796d673517eb1c91edf5712d80 Mon Sep 17 00:00:00 2001
From: Ana Krivokapic <akrivoka@redhat.com>
Date: Tue, 12 Nov 2013 14:50:57 +0100
Subject: [PATCH] Fix regression which prevents creating a winsync agreement

A regression, which prevented creation of a winsync agreement,
was introduced in the original fix for ticket #3989.

https://fedorahosted.org/freeipa/ticket/3989
---
 ipaserver/install/replication.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 4d8a4687e162155d7855e11ba5048bed2ff13fa5..c4e62fc91b4fb33c37b9f18ce167149ccd3bd54f 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -626,8 +626,9 @@ def setup_agreement(self, a_conn, b_hostname, port=389,
 
         if iswinsync:
             self.setup_winsync_agmt(entry, win_subtree)
+        else:
+            entry['nsds5ReplicaStripAttrs'] = [" ".join(STRIP_ATTRS)]
 
-        entry['nsds5ReplicaStripAttrs'] = [" ".join(STRIP_ATTRS)]
         a_conn.add_entry(entry)
 
         try:
-- 
1.8.3.1