diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-28 12:12:04 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
| commit | f9f6cd6e3a907f3bb205f5121727f4f94acfeaef (patch) | |
| tree | 1b4aa321eafcef4b73ca11f3ba1b112a3d19f9b7 /ipaserver/install/replication.py | |
| parent | 8f44811a9570e2a0dbc821b6ca48748a5d6eace7 (diff) | |
| download | freeipa.git-f9f6cd6e3a907f3bb205f5121727f4f94acfeaef.tar.gz freeipa.git-f9f6cd6e3a907f3bb205f5121727f4f94acfeaef.tar.xz freeipa.git-f9f6cd6e3a907f3bb205f5121727f4f94acfeaef.zip | |
Replace IPAdmin.start_tls_s by an __init__ argument
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/replication.py')
| -rw-r--r-- | ipaserver/install/replication.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index d97c5bdb..804d046b 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -189,9 +189,9 @@ class ReplicationManager(object): # If we are passed a password we'll use it as the DM password # otherwise we'll do a GSSAPI bind. if starttls: - self.conn = ipaldap.IPAdmin(hostname, port=port, cacert=CACERT, - protocol='ldap') - self.conn.start_tls_s() + self.conn = ipaldap.IPAdmin( + hostname, port=port, cacert=CACERT, protocol='ldap', + start_tls=True) else: self.conn = ipaldap.IPAdmin(hostname, port=port, cacert=CACERT) if dirman_passwd: @@ -917,9 +917,9 @@ class ReplicationManager(object): local_port = r_port # note - there appears to be a bug in python-ldap - it does not # allow connections using two different CA certs - r_conn = ipaldap.IPAdmin(r_hostname, port=r_port, cacert=CACERT, - protocol='ldap') - r_conn.start_tls_s() + r_conn = ipaldap.IPAdmin( + r_hostname, port=r_port, cacert=CACERT, protocol='ldap', + start_tls=True) if r_bindpw: r_conn.do_simple_bind(binddn=r_binddn, bindpw=r_bindpw) |