pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 116336 from Virtualization

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/116336
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=97
This commit is contained in:
Stephan Kulow 2012-05-08 09:15:01 +00:00 committed by Git OBS Bridge
commit 7da5c885b1
3 changed files with 108 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
4eb1c256-viruri-user.patch Normal file
View File

@ -0,0 +1,92 @@
commit 4eb1c2560d1ab8bae620788d343e9e7b32ddc066
Author: Guido Günther <agx@sigxcpu.org>
Date: Thu Apr 5 17:52:42 2012 +0200
virURIParse: don't forget to copy the user part
This got dropped with 300e60e15b22387dda41ed5985a9ebadfd86dd25
Cheers,
-- Guido
diff --git a/src/util/viruri.c b/src/util/viruri.c
index 2c6de51..a41f345 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -185,7 +185,9 @@ virURIParse(const char *uri)
if (xmluri->fragment &&
!(ret->fragment = strdup(xmluri->fragment)))
goto no_memory;
-
+ if (xmluri->user &&
+ !(ret->user = strdup(xmluri->user)))
+ goto no_memory;
/* First check: does it even make sense to jump inside */
if (ret->server != NULL &&
@@ -249,6 +251,7 @@ virURIFormat(virURIPtr uri)
xmluri.query = uri->query;
#endif
xmluri.fragment = uri->fragment;
+ xmluri.user = uri->user;
/* First check: does it make sense to do anything */
if (xmluri.server != NULL &&
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 3570217..4bb6a03 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -42,6 +42,7 @@ struct URIParseData {
const char *path;
const char *query;
const char *fragment;
+ const char *user;
virURIParamPtr params;
};
@@ -143,33 +144,34 @@ mymain(void)
signal(SIGPIPE, SIG_IGN);
#define TEST_FULL(uri, uri_out, scheme, server, port, path, query, \
- fragment, params) \
+ fragment, user, params) \
do { \
const struct URIParseData data = { \
uri, (uri_out) ? (uri_out) : (uri), scheme, server, port, \
- path, query, fragment, params \
+ path, query, fragment, user, params \
}; \
if (virtTestRun("Test URI " # uri, 1, testURIParse, &data) < 0) \
ret = -1; \
} while (0)
-#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, params) \
- TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, params)
+#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, user, params) \
+ TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, user, params)
#define TEST_PARAMS(query_in, query_out, params) \
TEST_FULL("test://example.com/?" query_in, \
*query_out ? "test://example.com/?" query_out : NULL, \
- "test", "example.com", 0, "/", query_in, NULL, params)
+ "test", "example.com", 0, "/", query_in, NULL, NULL, params)
virURIParam params[] = {
{ (char*)"name", (char*)"value" },
{ NULL, NULL },
};
- TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL);
- TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL);
- TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", params);
- TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL);
- TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL);
- TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL);
+ TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://foo@example.com", "test", "example.com", 0, NULL, NULL, NULL, "foo", NULL);
+ TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", NULL, params);
+ TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL, NULL);
virURIParam params1[] = {
{ (char*)"foo", (char*)"one" },

13
libvirt.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Apr 25 12:26:25 MDT 2012 - jfehlig@suse.com
- Copy user in virURIParse
4eb1c256-viruri-user.patch
bnc#757766
-------------------------------------------------------------------
Wed Apr 25 08:27:04 MDT 2012 - jfehlig@suse.com
- yajl is availabile in all supported SUSE products, so always
use it when building libvirtd
-------------------------------------------------------------------
Thu Apr 12 11:19:38 MDT 2012 - jfehlig@suse.com

6
libvirt.spec
View File

@ -144,10 +144,8 @@
%define with_capng 0%{!?_without_capng:1}
%endif
# Enable yajl library for JSON mode with QEMU in 11.4 or newer
%if 0%{?suse_version} >= 1140
# Enable yajl library for JSON mode with QEMU
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
%endif
# All supported version of openSUSE/SLE contain audit
%define with_audit 0%{!?_without_audit:1}
@ -412,6 +410,7 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
Patch0: 4eb1c256-viruri-user.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@ -547,6 +546,7 @@ Authors:
%prep
%setup -q
%patch0 -p1
%patch100 -p1
%patch101
%patch102 -p1