summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipaclient
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2011-07-25 17:14:01 +0200
committerRob Crittenden <rcritten@redhat.com>2011-07-25 01:47:52 -0400
commit9e7a3e7f3c46f8c2fc0b54353efd642b4178abf7 (patch)
treeaf10bdf4ad6d158f5b5182a3c1b546a05de795de /ipa-client/ipaclient
parent53ab352b4a4b650d2dea39599b8aa36e5431ffa8 (diff)
downloadfreeipa-9e7a3e7f3c46f8c2fc0b54353efd642b4178abf7.tar.gz
freeipa-9e7a3e7f3c46f8c2fc0b54353efd642b4178abf7.tar.xz
freeipa-9e7a3e7f3c46f8c2fc0b54353efd642b4178abf7.zip
Make sure that hostname specified by user is not an IP address.
ticket 1375
Diffstat (limited to 'ipa-client/ipaclient')
-rw-r--r--ipa-client/ipaclient/ipadiscovery.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py
index 77727b28e..ecd8275c4 100644
--- a/ipa-client/ipaclient/ipadiscovery.py
+++ b/ipa-client/ipaclient/ipadiscovery.py
@@ -24,7 +24,7 @@ import ipapython.dnsclient
import tempfile
import ldap
from ldap import LDAPError
-from ipapython.ipautil import run, CalledProcessError
+from ipapython.ipautil import run, CalledProcessError, valid_ip
NOT_FQDN = -1
@@ -119,6 +119,9 @@ class IPADiscovery:
if not hostname:
return BAD_HOST_CONFIG
+ if valid_ip(hostname):
+ return NOT_FQDN
+
# first, check for an LDAP server for the local domain
p = hostname.find(".")
if p == -1: #no domain name