IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipaldap: merge gssapi_bind to LDAPClient

Browse Source 
* Rename do_sasl_gssapi_bind to gssapi_bind

https://fedorahosted.org/freeipa/ticket/6461

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Tomas Krizek
2016-10-06 08:51:10 +02:00
committed by Martin Basti
parent 60e38ecc7f
commit 4f1a6a1776
10 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ipaserver/install/replication.py
View File

@@ -120,7 +120,7 @@ def enable_replication_version_checking(hostname, realm, dirman_passwd):
conn.simple_bind(bind_dn=ipaldap.DIRMAN_DN,
bind_password=dirman_passwd)
else:
conn.do_sasl_gssapi_bind()
conn.gssapi_bind()
entry = conn.get_entry(DN(('cn', 'IPA Version Replication'),
('cn', 'plugins'),
('cn', 'config')))
@@ -221,7 +221,7 @@ class ReplicationManager(object):
self.conn.simple_bind(bind_dn=ipaldap.DIRMAN_DN,
bind_password=dirman_passwd)
else:
self.conn.do_sasl_gssapi_bind()
self.conn.gssapi_bind()
else:
self.conn = conn
@@ -1013,7 +1013,7 @@ class ReplicationManager(object):
if r_bindpw:
r_conn.simple_bind(r_binddn, r_bindpw)
else:
r_conn.do_sasl_gssapi_bind()
r_conn.gssapi_bind()
#Setup the first half
l_id = self._get_replica_id(self.conn, r_conn)
@@ -1119,7 +1119,7 @@ class ReplicationManager(object):
if r_bindpw:
r_conn.simple_bind(r_binddn, r_bindpw)
else:
r_conn.do_sasl_gssapi_bind()
r_conn.gssapi_bind()
# First off make sure servers are in sync so that both KDCs
# have all principals and their passwords and can release
@@ -1149,7 +1149,7 @@ class ReplicationManager(object):
if r_bindpw:
r_conn.simple_bind(r_binddn, r_bindpw)
else:
r_conn.do_sasl_gssapi_bind()
r_conn.gssapi_bind()
# Allow krb principals to act as replicas
self.setup_krb_princs_as_replica_binddns(self.conn, r_conn)
@@ -1604,7 +1604,7 @@ class ReplicationManager(object):
# 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=389, protocol='ldap')
r_conn.do_sasl_gssapi_bind()
r_conn.gssapi_bind()
# Setup the first half
l_id = self._get_replica_id(self.conn, r_conn)
@@ -1752,7 +1752,7 @@ class CAReplicationManager(ReplicationManager):
and unified DS instance.
"""
r_conn = ipaldap.IPAdmin(r_hostname, port=389, protocol='ldap')
r_conn.do_sasl_gssapi_bind()
r_conn.gssapi_bind()
# Setup the first half
l_id = self._get_replica_id(self.conn, r_conn)