diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-06-25 08:41:46 +0000 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-06-27 08:48:40 +0200 |
| commit | 736dd0fcd6d35abbea28481dc544502c132f78f8 (patch) | |
| tree | 7003459be6a9769ff0faff6ca91e430e33744de3 | |
| parent | 093fa2daa03c8071ec65442c926c23ec34ae7184 (diff) | |
| download | freeipa-736dd0fcd6d35abbea28481dc544502c132f78f8.tar.gz freeipa-736dd0fcd6d35abbea28481dc544502c132f78f8.tar.xz freeipa-736dd0fcd6d35abbea28481dc544502c132f78f8.zip | |
Do not skip SSSD known hosts in ipa-client-install --ssh-trust-dns.
https://fedorahosted.org/freeipa/ticket/3705
| -rwxr-xr-x | 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 a5ba46cfc..b1881619d 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -1212,12 +1212,12 @@ def configure_ssh_config(fstore, options): 'PubkeyAuthentication': 'yes', } + if options.sssd and file_exists(SSH_PROXYCOMMAND): + changes['ProxyCommand'] = '%s -p %%p %%h' % SSH_PROXYCOMMAND + changes['GlobalKnownHostsFile'] = SSH_KNOWNHOSTSFILE if options.trust_sshfp: changes['VerifyHostKeyDNS'] = 'yes' changes['HostKeyAlgorithms'] = 'ssh-rsa,ssh-dss' - elif options.sssd and file_exists(SSH_PROXYCOMMAND): - changes['ProxyCommand'] = '%s -p %%p %%h' % SSH_PROXYCOMMAND - changes['GlobalKnownHostsFile'] = SSH_KNOWNHOSTSFILE change_ssh_config(ssh_config, changes, ['Host']) root_logger.info('Configured %s', ssh_config) |