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:49 +0200 |
| commit | 9e5ce4f501ed3706808c484e21ae0e322391b783 (patch) | |
| tree | 8c10f057fca4be389345c1685ee7d49295526c23 | |
| parent | 418185e8a02f25a6c08a91682af18629d91f9844 (diff) | |
| download | freeipa.git-9e5ce4f501ed3706808c484e21ae0e322391b783.tar.gz freeipa.git-9e5ce4f501ed3706808c484e21ae0e322391b783.tar.xz freeipa.git-9e5ce4f501ed3706808c484e21ae0e322391b783.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 a5ba46cf..b1881619 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) |