-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This is a minor optimization that didn't occur to me yesterday when I was reviewing Rob's patch - sorry.
The patch only adds _srv_ as the first entry if service discovery succeeded during ipa-client-install. This gets rid of the DNS timeout for cases where Bind is not included. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk1eY8EACgkQHsardTLnvCUjIwCgwGpPaONk8xp3TGdvE+CiMpvg IvYAoIWZStIoBd5JuMT+co88AwTNq18i =zA4P -----END PGP SIGNATURE-----
From f2eb0ec3cf4c2bcc698454bba97ed4501deb12b6 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek <jhro...@redhat.com> Date: Fri, 18 Feb 2011 10:24:40 +0100 Subject: [PATCH] Set SRV discovery for clients only if it succeeded during installation --- ipa-client/ipa-install/ipa-client-install | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 4b9bd29..f1e3184 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -477,7 +477,7 @@ def configure_certmonger(fstore, subject_base, cli_realm, options): except: print "certmonger request for host certificate failed" -def configure_sssd_conf(fstore, cli_domain, cli_server, options): +def configure_sssd_conf(fstore, cli_domain, cli_server, dnsok, options): fstore.backup_file("/etc/sssd/sssd.conf") sssdconfig = SSSDConfig.SSSDConfig() sssdconfig.new_config() @@ -485,7 +485,7 @@ def configure_sssd_conf(fstore, cli_domain, cli_server, options): domain = sssdconfig.new_domain(cli_domain) domain.add_provider('ipa', 'id') - domain.set_option('ipa_server', '_srv_, %s' % cli_server) + domain.set_option('ipa_server', dnsok and '_srv_, %s' % cli_server or cli_server) domain.set_option('ipa_domain', cli_domain) # Might need this if /bin/hostname doesn't return a FQDN @@ -817,7 +817,7 @@ def main(): print "Created /etc/ipa/default.conf" if options.sssd: - if configure_sssd_conf(fstore, cli_domain, cli_server, options): + if configure_sssd_conf(fstore, cli_domain, cli_server, dnsok, options): return 1 print "Configured /etc/sssd/sssd.conf" else: -- 1.7.4
jhrozek-freeipa-062-discovery.patch.sig
Description: PGP signature
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel