From 8b12ef50e1c016a5a025cf2a69271f769b585a03 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspacek@redhat.com>
Date: Jun 28 2016 12:14:32 +0000
Subject: client: Share validator and domain name normalization with server install


https://fedorahosted.org/freeipa/ticket/5976

Reviewed-By: Martin Basti <mbasti@redhat.com>

---

diff --git a/client/ipa-client-install b/client/ipa-client-install
index 0a601b6..2da2720 100755
--- a/client/ipa-client-install
+++ b/client/ipa-client-install
@@ -54,7 +54,8 @@ try:
     from ipapython.config import IPAOptionParser
     from ipalib import api, errors
     from ipalib import x509, certstore
-    from ipalib.util import verify_host_resolvable
+    from ipalib.util import (
+        normalize_hostname, validate_domain_name, verify_host_resolvable)
     from ipalib.constants import CACERT
     from ipapython.dn import DN
     from ipapython.ssh import SSHPublicKey
@@ -230,6 +231,13 @@ def parse_options():
     if (options.server and not options.domain):
         parser.error("--server cannot be used without providing --domain")
 
+    if options.domain:
+        try:
+            validate_domain_name(options.domain)
+        except ValueError as ex:
+            parser.error("invalid domain name: %s" % ex)
+        options.domain = normalize_hostname(options.domain)
+
     if options.force_ntpd and not options.conf_ntp:
         parser.error("--force-ntpd cannot be used together with --no-ntp")