summaryrefslogtreecommitdiffstats
path: root/ipa-client
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:09 +0200
commit7d2d1cb59d22eeed9ed62541299e96ea97006d0e (patch)
tree8d83eb25cb1010900ee078aab392f2e29b77c9b6 /ipa-client
parent88759cf7b6b3d6da1f10e4e8fbf26685e5235a7b (diff)
downloadfreeipa-7d2d1cb59d22eeed9ed62541299e96ea97006d0e.tar.gz
freeipa-7d2d1cb59d22eeed9ed62541299e96ea97006d0e.tar.xz
freeipa-7d2d1cb59d22eeed9ed62541299e96ea97006d0e.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
Diffstat (limited to 'ipa-client')
-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 7e474bd59..fdfadee76 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1097,7 +1097,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: