From 15e213d0258f69feaf6031a8721902f63c864ac2 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 17 Mar 2011 10:22:33 -0400 Subject: Ensure that the system hostname is lower-case. ticket 1080 --- ipa-client/ipa-install/ipa-client-install | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ipa-client/ipa-install/ipa-client-install') diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 4ff4c458e..4e29fa988 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -681,6 +681,13 @@ def main(): if options.unattended and (options.password is None and options.principal is None and options.prompt_password is False) and not options.on_master: sys.exit("One of password and principal are required.") + if options.hostname: + hostname = options.hostname + else: + hostname = socket.getfqdn() + if hostname != hostname.lower(): + sys.exit('Invalid hostname \'%s\', must be lower-case.' % hostname) + # Create the discovery instance ds = ipaclient.ipadiscovery.IPADiscovery() @@ -756,6 +763,7 @@ def main(): logging.debug("will use cli_basedn: %s\n", cli_basedn) subject_base = "O=%s" % ds.getRealmName() + print "Hostname: "+hostname print "Realm: "+cli_realm print "DNS Domain: "+cli_domain print "IPA Server: "+cli_server @@ -876,11 +884,6 @@ def main(): # Add the CA to the default NSS database and trust it run(["/usr/bin/certutil", "-A", "-d", "/etc/pki/nssdb", "-n", "IPA CA", "-t", "CT,C,C", "-a", "-i", "/etc/ipa/ca.crt"]) - if options.hostname: - hostname = options.hostname - else: - hostname = socket.getfqdn() - # If on master assume kerberos is already configured properly. if not options.on_master: # Configure krb5.conf -- cgit