Fix remote socket path for SSH tunnel connections

diff --git a/ChangeLog b/ChangeLog
index 829fe103c29ef264de60ab65ba603b3613af6a5c..94c6a0cb8d12710a8e1029e4206d4d93063ba759 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 18 14:56:24 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/remote_internal.c: Fix socket path for remote SSH
+       tunnels to honour read-only flag
+
 Wed Jun 17 10:31:35 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
        * src/node_device.[ch] src/storage_backend.[ch]: fixes a

diff --git a/src/remote_internal.c b/src/remote_internal.c
index 6c5d9f8646dad8e27517533f377267e1e6599bff..19d0ac84bf4a4351793020de3ca504c21d7b20f8 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -722,7 +722,10 @@ doRemoteOpen (virConnectPtr conn,
         cmd_argv[j++] = strdup (priv->hostname);
         cmd_argv[j++] = strdup (netcat ? netcat : "nc");
         cmd_argv[j++] = strdup ("-U");
-        cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET);
+        cmd_argv[j++] = strdup (sockname ? sockname :
+                                (flags & VIR_CONNECT_RO
+                                 ? LIBVIRTD_PRIV_UNIX_SOCKET_RO
+                                 : LIBVIRTD_PRIV_UNIX_SOCKET));
         cmd_argv[j++] = 0;
         assert (j == nr_args);
         for (j = 0; j < (nr_args-1); j++)