IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

client: Share validator and domain name normalization with server install

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

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Petr Spacek 2016-06-27 14:00:01 +02:00 committed by Martin Basti
parent 5f52e0fcbf
commit 8b12ef50e1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/ipa-client-install
View File

@ -54,7 +54,8 @@ try:
from ipapython.config import IPAOptionParser from ipapython.config import IPAOptionParser
from ipalib import api, errors from ipalib import api, errors
from ipalib import x509, certstore 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 ipalib.constants import CACERT
from ipapython.dn import DN from ipapython.dn import DN
from ipapython.ssh import SSHPublicKey from ipapython.ssh import SSHPublicKey
@ -230,6 +231,13 @@ def parse_options():
if (options.server and not options.domain): if (options.server and not options.domain):
parser.error("--server cannot be used without providing --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: if options.force_ntpd and not options.conf_ntp:
parser.error("--force-ntpd cannot be used together with --no-ntp") parser.error("--force-ntpd cannot be used together with --no-ntp")