summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2011-06-24 16:56:25 +0200
committerRob Crittenden <rcritten@redhat.com>2011-06-24 01:23:14 -0400
commit3656d9be3cabc16511dafaed593d272ec068e4b3 (patch)
treefda192bdf2da1e1785823a8dc52fe08adc49c9a6
parentb02b77f8d777cf27a3f21155352e88c71db145c7 (diff)
downloadfreeipa-3656d9be3cabc16511dafaed593d272ec068e4b3.zip
freeipa-3656d9be3cabc16511dafaed593d272ec068e4b3.tar.gz
freeipa-3656d9be3cabc16511dafaed593d272ec068e4b3.tar.xz
Verify that the hostname is fully-qualified before accessing the service information in ipactl.
Fail gracefully if the supplied hostname isn't fully-qualified in ipa-server-install. ticket 1035
-rwxr-xr-xinstall/tools/ipa-server-install15
-rwxr-xr-xinstall/tools/ipactl3
2 files changed, 10 insertions, 8 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 09cc8a0..504da2c 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -573,15 +573,14 @@ def main():
else:
host_default = get_fqdn()
- if options.unattended:
- try:
+ try:
+ if options.unattended:
verify_fqdn(host_default,options.no_host_dns)
- except RuntimeError, e:
- sys.exit(str(e) + "\n")
-
- host_name = host_default
- else:
- host_name = read_host_name(host_default,options.no_host_dns)
+ host_name = host_default
+ else:
+ host_name = read_host_name(host_default,options.no_host_dns)
+ except RuntimeError, e:
+ sys.exit(str(e) + "\n")
host_name = host_name.lower()
logging.debug("will use host_name: %s\n" % host_name)
diff --git a/install/tools/ipactl b/install/tools/ipactl
index 01b88a5..a944517 100755
--- a/install/tools/ipactl
+++ b/install/tools/ipactl
@@ -295,6 +295,9 @@ def main():
api.bootstrap(context='cli', debug=options.debug)
api.finalize()
+ if '.' not in api.env.host:
+ raise IpactlError("Invalid hostname, must be fully-qualified")
+
if args[0].lower() == "start":
ipa_start()
elif args[0].lower() == "stop":