External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virt-ssh-helper: Accept ?socket= in connection URI

Browse Source 
Similarly to the previous commit, let's accept "socket" parameter
in the connection URI. This change will allow us to use
virt-ssh-helper instead of 'nc' in all cases (done in one of
future commits).

Please note, when the parameter is used it effectively disables
automatic daemon spawning and an error is reported. But this is
intentional - so that the helper behaves just like regular
virConnectOpen() with different transport than ssh, e.g. unix.

But this 'change' is acceptable - there's no way for users to
make our remote code pass the argument to virt-ssh-helper, yet.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2023-02-03 10:52:06 +01:00
parent 8275a06182
commit 77b4a67cf6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/remote/remote_ssh_helper.c
View File

@ -438,6 +438,9 @@ int main(int argc, char **argv)
if (STRCASEEQ(var->name, "mode")) {
mode_str = var->value;
continue;
} else if (STRCASEEQ(var->name, "socket")) {
sock_path = g_strdup(var->value);
continue;
}
}
@ -447,11 +450,12 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
sock_path = remoteGetUNIXSocket(transport,
mode,
driver,
flags,
&daemon_path);
if (!sock_path &&
!(sock_path = remoteGetUNIXSocket(transport, mode,
driver, flags, &daemon_path))) {
g_printerr(_("%s: failed to generate UNIX socket path"), argv[0]);
exit(EXIT_FAILURE);
}
if (virNetSocketNewConnectUNIX(sock_path, daemon_path, &sock) < 0) {
g_printerr(_("%s: cannot connect to '%s': %s\n"),