NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

remote: do not check for an existing config dir

Browse Source 
When composing the path to the default known_hosts file (for the libssh
and libssh2 drivers), do not check whether the configuration directory
(determined by virGetUserConfigDirectory()) exists: both the drivers can
handle non-existing files, and are able to create them (and their
directories) in that case.

This adds a small behaviour change: before, the key for an unknown host,
and manually accepted, was saved only if the configuration directory
existed -- a bit incoherent behaviour though.
This commit is contained in:
Pino Toscano 2017-01-10 19:43:20 +01:00 committed by Peter Krempa
parent 45c4a70c70
commit 1a5de3fe2e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc/virnetclient.c
View File

@ -462,11 +462,9 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
} else { } else {
confdir = virGetUserConfigDirectory(); confdir = virGetUserConfigDirectory();
if (confdir) { if (confdir) {
if (virFileExists(confdir)) { virBufferAsprintf(&buf, "%s/known_hosts", confdir);
virBufferAsprintf(&buf, "%s/known_hosts", confdir); if (!(knownhosts = virBufferContentAndReset(&buf)))
if (!(knownhosts = virBufferContentAndReset(&buf))) goto no_memory;
goto no_memory;
}
} }
} }
@ -573,10 +571,8 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
} else { } else {
confdir = virGetUserConfigDirectory(); confdir = virGetUserConfigDirectory();
if (confdir) { if (confdir) {
if (virFileExists(confdir)) { if (virAsprintf(&knownhosts, "%s/known_hosts", confdir) < 0)
if (virAsprintf(&knownhosts, "%s/known_hosts", confdir) < 0) goto cleanup;
goto cleanup;
}
} }
} }