From c332fbbcd5863aaad464d6613b6b61d77ad99031 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@fedoraproject.org>
Date: Sat, 19 Jan 2008 02:20:33 +0000
Subject: [PATCH] Fix SSH tunnelling

---
 libvirt-0.4.0-remote-ssh.patch | 17 +++++++++++++++++
 libvirt.spec                   |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 libvirt-0.4.0-remote-ssh.patch

diff --git a/libvirt-0.4.0-remote-ssh.patch b/libvirt-0.4.0-remote-ssh.patch
new file mode 100644
index 0000000..f3cecca
--- /dev/null
+++ b/libvirt-0.4.0-remote-ssh.patch
@@ -0,0 +1,17 @@
+diff -rup libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
+--- libvirt-0.4.0.orig/src/remote_internal.c	2008-01-14 19:32:25.000000000 -0500
++++ libvirt-0.4.0.new/src/remote_internal.c	2008-01-14 19:32:42.000000000 -0500
+@@ -677,11 +677,12 @@ doRemoteOpen (virConnectPtr conn,
+         cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET);
+         cmd_argv[j++] = 0;
+         assert (j == nr_args);
+-        for (j = 0; j < nr_args; j++)
++        for (j = 0; j < (nr_args-1); j++) {
+             if (cmd_argv[j] == NULL) {
+                 error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM));
+                 goto failed;
+             }
++        }
+     }
+ 
+         /*FALLTHROUGH*/
diff --git a/libvirt.spec b/libvirt.spec
index 74eebf1..f9b12cb 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -11,13 +11,14 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.4.0
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 Patch1: libvirt-%{version}-auth-null-cb.patch
 Patch2: libvirt-%{version}-conffile-size.patch
 Patch3: libvirt-%{version}-auth-null-cb-2.patch
+Patch4: libvirt-%{version}-remote-ssh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -90,6 +91,7 @@ of recent versions of Linux (and other OSes).
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@@ -209,6 +211,9 @@ fi
 %doc docs/examples/python
 
 %changelog
+* Fri Jan 18 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc7
+- Fix SSH tunnelling (rhbz #428743)
+
 * Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc7
 - Fix crash when no auth callback