summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-10-03 15:09:02 +0200
committerMartin Kosek <mkosek@redhat.com>2013-10-03 15:22:16 +0200
commit38592f77b40eab2b5a131ab57807152116406ce6 (patch)
tree750d4485b5d046335f243498752a373fde9ff8a5
parentdf191ac52508be609eba9edb69efcc2a39e4d46b (diff)
downloadfreeipa.git-38592f77b40eab2b5a131ab57807152116406ce6.tar.gz
freeipa.git-38592f77b40eab2b5a131ab57807152116406ce6.tar.xz
freeipa.git-38592f77b40eab2b5a131ab57807152116406ce6.zip
Do not set DNS discovery domain in server mode
In server mode, the discovery domain should be left unset in all cases as the DNS discovery is only driven by the AD domains. https://fedorahosted.org/freeipa/ticket/3947
-rwxr-xr-xipa-client/ipa-install/ipa-client-install3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 325b532a..6fb36161 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1095,7 +1095,8 @@ def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options, clie
domain.add_provider('ipa', 'id')
#add discovery domain if client domain different from server domain
- if cli_domain != client_domain:
+ #do not set this config in server mode (#3947)
+ if not options.on_master and cli_domain != client_domain:
domain.set_option('dns_discovery_domain', cli_domain)
if not options.on_master: