On Fri, Jul 24, 2020 at 06:22:37PM +0200, Andrea Bolognani wrote:
On Fri, 2020-07-24 at 16:14 +0100, Daniel P. Berrangé wrote:
> char *
> +virNetClientSSHHelperCommand(virNetClientProxy proxy,
> + const char *netcatPath,
> + const char *socketPath,
> + const char *driverURI,
> + bool readonly)
> +{
[...]
> + switch (proxy) {
> + case VIR_NET_CLIENT_PROXY_AUTO:
> + return g_strdup_printf("sh -c 'which virt-nc 1>/dev/null
2>&1; "
> + "if test $? = 0; then "
> + " %s; "
> + "else"
> + " %s; "
> + "fi'", helpercmd, nccmd);
s/virt-nc/virt-ssh-helper/
I still think that the presence of an explicit 'netcat' parameter in
the URI should result in switching to proxy=netcat instead of the
default behavior, because the user is very clearly indicating that
they want a specific netcat binary to be used as remote proxy.
You chopped out the context where that is done
+ if (proxy == VIR_NET_CLIENT_PROXY_AUTO &&
+ netcatPath != NULL) {
+ proxy = VIR_NET_CLIENT_PROXY_NETCAT;
+ }
Regards,
Daniel
--
|:
https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|:
https://libvirt.org -o-
https://fstop138.berrange.com :|
|:
https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|