From 8d235c6b7134d54acee315a50a53d0d741173b64 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 4 Nov 2010 16:57:20 -0400 Subject: Verify the --ip-address option when setting up DNS. There was a corner case where the value of --ip-address was never verified if you were also setting up DNS. Added this bit of information to the man page too. ticket 399 --- install/tools/ipa-server-install | 2 ++ install/tools/man/ipa-server-install.1 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 6a9d1bc5..2cc590ed 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -598,6 +598,8 @@ def main(): if options.ip_address and options.ip_address != ip: if options.setup_dns: + if not verify_ip_address(options.ip_address): + return 1 ip = options.ip_address else: print >>sys.stderr, "Error: the hostname resolves to an IP address that is different" diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1 index 8fb58a0e..1f2f89f2 100644 --- a/install/tools/man/ipa-server-install.1 +++ b/install/tools/man/ipa-server-install.1 @@ -53,7 +53,7 @@ Configure a self\-signed CA instance for issuing server certificates instead of The fully\-qualified DNS name of this server .TP \fB\-\-ip\-address\fR=\fIIP_ADDRESS\fR -The IP address of this server +The IP address of this server. If this address does not match the address the host resolves to and --setup-dns is not selected the installation will fail. .TP \fB\-U\fR, \fB\-\-unattended\fR An unattended installation that will never prompt for user input -- cgit