diff options
author | Lars Sjostrom <lars radicore se> | 2011-12-21 22:32:01 +0100 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-03-14 22:06:26 -0400 |
commit | 96390ca3e5f9fb89fe930e62dbd267a2de0af1d1 (patch) | |
tree | cb340209ed53d3219917487d820d3bfef90e43e1 /ipa-client/ipa-install/ipa-client-install | |
parent | 14975cdcddab5f757502ef7736e93a965ce1f207 (diff) | |
download | freeipa-96390ca3e5f9fb89fe930e62dbd267a2de0af1d1.tar.gz freeipa-96390ca3e5f9fb89fe930e62dbd267a2de0af1d1.tar.xz freeipa-96390ca3e5f9fb89fe930e62dbd267a2de0af1d1.zip |
Add disovery domain if client domain is different from server domain
https://fedorahosted.org/freeipa/ticket/2209
Diffstat (limited to 'ipa-client/ipa-install/ipa-client-install')
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index b7753f544..75c60653c 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -695,7 +695,7 @@ def configure_certmonger(fstore, subject_base, cli_realm, hostname, options): except: print "%s request for host certificate failed" % (cmonger.service_name) -def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options): +def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options, client_domain): try: sssdconfig = SSSDConfig.SSSDConfig() sssdconfig.import_config() @@ -748,6 +748,10 @@ def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options): domain.add_provider('ipa', 'id') + #add discovery domain if client domain different from server domain + if cli_domain != client_domain: + domain.set_option('dns_discovery_domain', cli_domain) + if not options.on_master: domain.set_option('ipa_server', '_srv_, %s' % cli_server) else: @@ -1348,7 +1352,7 @@ def install(options, env, fstore, statestore): # Always back up sssd.conf. It gets updated by authconfig --enablekrb5. fstore.backup_file("/etc/sssd/sssd.conf") if options.sssd: - if configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options): + if configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options, client_domain): return CLIENT_INSTALL_ERROR print "Configured /etc/sssd/sssd.conf" |