diff options
author | Jan Cholasta <jcholast@redhat.com> | 2013-01-31 11:19:13 +0100 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:46 +0100 |
commit | bb36683c8480a68d54ef632daa0a4d6df9802187 (patch) | |
tree | 00c9652ad120eb4d3a0c3807025615ecbb0d03f1 /install/tools | |
parent | 982b78277755a301e3baa1d4f2bd7e1663fb88a5 (diff) | |
download | freeipa-bb36683c8480a68d54ef632daa0a4d6df9802187.tar.gz freeipa-bb36683c8480a68d54ef632daa0a4d6df9802187.tar.xz freeipa-bb36683c8480a68d54ef632daa0a4d6df9802187.zip |
Use the dn attribute of LDAPEntry to set/get DNs of entries.
Convert all code that uses the 'dn' key of LDAPEntry for this to use the dn
attribute instead.
Diffstat (limited to 'install/tools')
-rw-r--r-- | install/tools/ipa-compliance | 10 | ||||
-rwxr-xr-x | install/tools/ipa-replica-install | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/install/tools/ipa-compliance b/install/tools/ipa-compliance index c82e4151f..9b34350b4 100644 --- a/install/tools/ipa-compliance +++ b/install/tools/ipa-compliance @@ -116,7 +116,7 @@ def check_compliance(tmpdir, debug=False): hostcount = 0 # Get the hosts first try: - (entries, truncated) = conn.find_entries('(krblastpwdchange=*)', ['dn'], + (entries, truncated) = conn.find_entries('(krblastpwdchange=*)', [], DN(api.env.container_host, api.env.basedn), conn.SCOPE_ONELEVEL, size_limit = -1) @@ -136,10 +136,10 @@ def check_compliance(tmpdir, debug=False): available = 0 try: (entries, truncated) = conn.find_entries('(objectclass=ipaentitlement)', - ['dn', 'userCertificate'], - DN(api.env.container_entitlements, api.env.basedn), - conn.SCOPE_ONELEVEL, - size_limit = -1) + ['userCertificate'], + DN(api.env.container_entitlements, api.env.basedn), + conn.SCOPE_ONELEVEL, + size_limit = -1) for entry in entries: (dn, attrs) = entry diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 13c32607a..846122db3 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -572,7 +572,7 @@ def main(): config.dirman_password) found = False try: - entry = conn.find_entries(u'fqdn=%s' % host, ['dn', 'fqdn'], DN(api.env.container_host, api.env.basedn)) + entry = conn.find_entries(u'fqdn=%s' % host, ['fqdn'], DN(api.env.container_host, api.env.basedn)) print "The host %s already exists on the master server.\nYou should remove it before proceeding:" % host print " %% ipa host-del %s" % host found = True |