summaryrefslogtreecommitdiffstats
path: root/install/tools/ipa-adtrust-install
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-10-31 16:54:49 +0000
committerPetr Viktorin <pviktori@redhat.com>2014-01-24 20:29:31 +0100
commit08051f16516a3978494ae94032d55cc8b1426df9 (patch)
treeef986eeac49cc666cb3ef5e140da8ef349b8ae58 /install/tools/ipa-adtrust-install
parenta5f322cb7b9b4d999a6394197c3730062896780c (diff)
downloadfreeipa-08051f16516a3978494ae94032d55cc8b1426df9.tar.gz
freeipa-08051f16516a3978494ae94032d55cc8b1426df9.tar.xz
freeipa-08051f16516a3978494ae94032d55cc8b1426df9.zip
Convert remaining installer code to LDAPEntry API.
Diffstat (limited to 'install/tools/ipa-adtrust-install')
-rwxr-xr-xinstall/tools/ipa-adtrust-install12
1 files changed, 6 insertions, 6 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index e81d0ec8f..3af6936b0 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -118,13 +118,13 @@ def set_and_check_netbios_name(netbios_name, unattended):
cur_netbios_name = None
gen_netbios_name = None
reset_netbios_name = False
- dom_dn = None
+ entry = None
try:
- (dom_dn, entry) = api.Backend.ldap2.get_entry(DN(('cn', api.env.domain),
- api.env.container_cifsdomains,
- ipautil.realm_to_suffix(api.env.realm)),
- [flat_name_attr])
+ entry = api.Backend.ldap2.get_entry(
+ DN(('cn', api.env.domain), api.env.container_cifsdomains,
+ ipautil.realm_to_suffix(api.env.realm)),
+ [flat_name_attr])
except errors.NotFound:
# trust not configured
pass
@@ -160,7 +160,7 @@ def set_and_check_netbios_name(netbios_name, unattended):
if not netbios_name:
gen_netbios_name = adtrustinstance.make_netbios_name(api.env.domain)
- if dom_dn:
+ if entry is not None:
# Fix existing trust configuration
print "Trust is configured but no NetBIOS domain name found, " \
"setting it now."