From 10b8e8751c9e679e5c66df4dedbc40240338783c Mon Sep 17 00:00:00 2001
From: JR Aquino <jr.aquino@citrix.com>
Date: Fri, 16 Sep 2011 10:23:02 -0700
Subject: [PATCH] 40 Adjust replica installation to omit processing memberof
 computations

https://fedorahosted.org/freeipa/ticket/1794
---
 install/tools/ipa-replica-install       |    4 +++-
 install/ui/test/data/json_metadata.json |    1 +
 ipaserver/install/dsinstance.py         |    2 +-
 ipaserver/install/replication.py        |    8 ++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 9b7e643..356549b 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -468,7 +468,9 @@ def main():
         raise RuntimeError("Failed to configure the client")
 
     ds.replica_populate()
-    ds.init_memberof()
+    # NGK - we don't need to run a memberof task if we send
+    # memberof values during total update.
+    #ds.init_memberof()
 
     #Everything installed properly, activate ipa service.
     ipaservices.knownservices.ipa.enable()
diff --git a/install/ui/test/data/json_metadata.json b/install/ui/test/data/json_metadata.json
index 482eb6c..f87ab11 100644
--- a/install/ui/test/data/json_metadata.json
+++ b/install/ui/test/data/json_metadata.json
@@ -3273,6 +3273,7 @@
                     "nsds5replicaroot",
                     "nsds5replicasessionpausetime",
                     "nsds5replicatedattributelist",
+                    "nsds5replicatedattributelisttotal",
                     "nsds5replicatimeout",
                     "nsds5replicatombstonepurgeinterval",
                     "nsds5replicatransportinfo",
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 790b560..f62d869 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -205,7 +205,6 @@ class DsInstance(service.Service):
         self.step("restarting directory server", self.__restart_instance)
 
     def __common_post_setup(self):
-        self.step("initializing group membership", self.init_memberof)
         self.step("adding master entry", self.__add_master_entry)
         self.step("configuring Posix uid/gid generation",
                   self.__config_uidgid_gen)
@@ -235,6 +234,7 @@ class DsInstance(service.Service):
         self.__setup_sub_dict()
         self.__common_setup()
 
+        self.step("initializing group membership", self.init_memberof)
         self.step("adding default layout", self.__add_default_layout)
         self.step("adding delegation layout", self.__add_delegation_layout)
         self.step("adding replication acis", self.__add_replication_acis)
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 961e713..7211881 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -461,6 +461,12 @@ class ReplicationManager(object):
                     'krblastfailedauth',
                     'krbloginfailedcount')
 
+        # List of attributes that need to be excluded from replication initialization.
+        totalexcludes = ('entryusn',
+                         'krblastsuccessfulauth',
+                         'krblastfailedauth',
+                         'krbloginfailedcount')
+
         entry = ipaldap.Entry(dn)
         entry.setValues('objectclass', "nsds5replicationagreement")
         entry.setValues('cn', cn)
@@ -472,6 +478,8 @@ class ReplicationManager(object):
             entry.setValues('nsds5replicaupdateschedule', '0000-2359 0123456')
             entry.setValues('nsDS5ReplicatedAttributeList',
                             '(objectclass=*) $ EXCLUDE %s' % " ".join(excludes))
+            entry.setValues('nsDS5ReplicatedAttributeListTotal',
+                            '(objectclass=*) $ EXCLUDE %s' % " ".join(totalexcludes))
         entry.setValues('description', "me to %s" % b_hostname)
         if isgssapi:
             entry.setValues('nsds5replicatransportinfo', 'LDAP')
-- 
1.7.6.1