summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install/ipa-client-install
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-03-15 09:12:35 -0400
committerAdam Young <ayoung@redhat.com>2011-03-15 11:01:03 -0400
commita36bc4ee93d13c28f8edf2bb94eb4dbfc25be568 (patch)
treed745071b31a9adcecd06faaa7e7710c6940c99f5 /ipa-client/ipa-install/ipa-client-install
parent0b6b2342d0d723336b2c612460e3b7ec43f21112 (diff)
downloadfreeipa-a36bc4ee93d13c28f8edf2bb94eb4dbfc25be568.zip
freeipa-a36bc4ee93d13c28f8edf2bb94eb4dbfc25be568.tar.gz
freeipa-a36bc4ee93d13c28f8edf2bb94eb4dbfc25be568.tar.xz
Always consider domain and server when doing DNS discovery in client.
When not on master we weren't passing in the user-supplied domain and server. Because of changes made that require TLS on the LDAP calls we always need the server name early in the process to retrieve the IPA CA certificate. ticket 1090
Diffstat (limited to 'ipa-client/ipa-install/ipa-client-install')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install12
1 files changed, 4 insertions, 8 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 720e813..4ff4c45 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -684,10 +684,8 @@ def main():
# Create the discovery instance
ds = ipaclient.ipadiscovery.IPADiscovery()
- if options.on_master:
- ret = ds.search(domain=options.domain, server=options.server)
- else:
- ret = ds.search()
+ ret = ds.search(domain=options.domain, server=options.server)
+
if ret == -10:
print >>sys.stderr, "Can't get the fully qualified name of this host"
print >>sys.stderr, "Please check that the client is properly configured"
@@ -703,10 +701,8 @@ def main():
print "DNS discovery failed to determine your DNS domain"
cli_domain = user_input("Please provide the domain name of your IPA server (ex: example.com)", allow_empty = False)
logging.debug("will use domain: %s\n", cli_domain)
- if options.on_master:
- ret = ds.search(domain=cli_domain, server=options.server)
- else:
- ret = ds.search(domain=cli_domain)
+ ret = ds.search(domain=cli_domain, server=options.server)
+
if not cli_domain:
if ds.getDomainName():
cli_domain = ds.getDomainName()