diff options
author | Simo Sorce <ssorce@redhat.com> | 2011-01-19 09:53:59 -0500 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2011-01-25 14:01:35 -0500 |
commit | 27da394c442e98334726a7aae7da885c840be350 (patch) | |
tree | 48123cf33716ff8ec9ca007ae4bd9dac4f7eae8f /ipaserver | |
parent | 34cedfe138fe97841a673b83b7e6a978617d28bf (diff) | |
download | freeipa-27da394c442e98334726a7aae7da885c840be350.tar.gz freeipa-27da394c442e98334726a7aae7da885c840be350.tar.xz freeipa-27da394c442e98334726a7aae7da885c840be350.zip |
Fix ipa-replica-manage regressions with winsync
Avoids ipa-replica-manage to throw up errors.
Fixes: https://fedorahosted.org/freeipa/ticket/807
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/install/dsinstance.py | 1 | ||||
-rw-r--r-- | ipaserver/install/replication.py | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 7bf29ce98..299505201 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -180,6 +180,7 @@ class DsInstance(service.Service): self.dercert = None self.idstart = None self.idmax = None + self.subject_base = None if realm_name: self.suffix = util.realm_to_suffix(self.realm_name) self.__setup_sub_dict() diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 3c2f3c180..77ca0578e 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -625,7 +625,8 @@ class ReplicationManager: # there is no other side to get a replica ID from # So we generate one locally replica_id = self._get_replica_id(self.conn, self.conn) - self.basic_replication_setup(self.conn, replica_id) + self.basic_replication_setup(self.conn, replica_id, + self.repl_man_dn, self.repl_man_passwd) #now add a passync user allowed to access the AD server self.add_passsync_user(self.conn, passsync_pw) @@ -638,8 +639,9 @@ class ReplicationManager: logging.info("Agreement is ready, starting replication . . .") #Finally start replication - return self.start_replication(self.conn, ad_conn, - self.repl_man_dn, self.repl_man_passwd) + ret = self.start_replication(ad_conn) + if ret != 0: + raise RuntimeError("Failed to start replication") def convert_to_gssapi_replication(self, r_hostname, r_binddn, r_bindpw): r_conn = ipaldap.IPAdmin(r_hostname, port=PORT, cacert=CACERT) |