summaryrefslogtreecommitdiffstats
path: root/install/tools
diff options
context:
space:
mode:
authorTomas Krizek <tkrizek@redhat.com>2016-11-09 12:53:14 +0100
committerMartin Basti <mbasti@redhat.com>2016-11-22 16:17:27 +0100
commit68295bf8cfd57333deb50f58df1b336a4b48ffe7 (patch)
tree525a018e5d7216847b09d0373bbdc0de2f8e55e0 /install/tools
parent4c133837d149352a68e1d6cbefbb28e4ae048755 (diff)
downloadfreeipa-68295bf8cfd57333deb50f58df1b336a4b48ffe7.tar.gz
freeipa-68295bf8cfd57333deb50f58df1b336a4b48ffe7.tar.xz
freeipa-68295bf8cfd57333deb50f58df1b336a4b48ffe7.zip
services: replace admin_conn with api.Backend.ldap2
Since service.admin_conn is only an alias to api.Backend.ldap2, replace it everywhere with the explicit api.Backend.ldap2 instead. https://fedorahosted.org/freeipa/ticket/6461 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'install/tools')
-rwxr-xr-xinstall/tools/ipa-adtrust-install6
1 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index 8eed5191a..8b75d5c3a 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -411,7 +411,7 @@ def main():
try:
# Search only masters which have support for domain levels
# because only these masters will have SSSD recent enough to support AD trust agents
- entries_m, _truncated = smb.admin_conn.find_entries(
+ entries_m, _truncated = api.Backend.ldap2.find_entries(
filter="(&(objectclass=ipaSupportedDomainLevelConfig)(ipaMaxDomainLevel=*)(ipaMinDomainLevel=*))",
base_dn=masters_dn, attrs_list=['cn'], scope=ldap.SCOPE_ONELEVEL)
except errors.NotFound:
@@ -421,7 +421,7 @@ def main():
print(unicode(e))
try:
- entries_a, _truncated = smb.admin_conn.find_entries(
+ entries_a, _truncated = api.Backend.ldap2.find_entries(
filter="", base_dn=agents_dn, attrs_list=['member'],
scope=ldap.SCOPE_BASE)
except errors.NotFound:
@@ -470,7 +470,7 @@ def main():
# Add the CIFS and host principals to the 'adtrust agents' group
# as 389-ds only operates with GroupOfNames, we have to use
# the principal's proper dn as defined in self.cifs_agent
- service.add_principals_to_group(smb.admin_conn, agents_dn, "member",
+ service.add_principals_to_group(api.Backend.ldap2, agents_dn, "member",
[x[1] for x in new_agents])
print("""
WARNING: you MUST restart (e.g. ipactl restart) the following IPA masters in order