diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-06-27 14:00:01 +0200 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-06-28 14:14:32 +0200 |
commit | 8b12ef50e1c016a5a025cf2a69271f769b585a03 (patch) | |
tree | 0a63d0462c7f20dedbff96e340486bdb4fb15c2a /client | |
parent | 5f52e0fcbfb927c3adada58e94bd10685535d2bd (diff) | |
download | freeipa-8b12ef50e1c016a5a025cf2a69271f769b585a03.tar.gz freeipa-8b12ef50e1c016a5a025cf2a69271f769b585a03.tar.xz freeipa-8b12ef50e1c016a5a025cf2a69271f769b585a03.zip |
client: Share validator and domain name normalization with server install
https://fedorahosted.org/freeipa/ticket/5976
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'client')
-rwxr-xr-x | client/ipa-client-install | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install index 0a601b631..2da2720d1 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") |