From: Keir Fraser <keir@xensource.com>
Date: Wed, 17 Oct 2007 09:02:49 +0000 (+0100)
Subject: Fix xenstore unwatch with node name starting with "@"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14847^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e43914aa8f2b569d99da99ce412e3a47e1906c7;p=xen.git

Fix xenstore unwatch with node name starting with "@"
Watch node starting with "@" should not be canonicalized.
Signed-off-by: Xiaowei Yang <xiaowei.yang@intel.com>
---

diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c
index f5692f83e5..5fa8bbbe22 100644
--- a/tools/xenstore/xenstored_watch.c
+++ b/tools/xenstore/xenstored_watch.c
@@ -170,7 +170,7 @@ void do_unwatch(struct connection *conn, struct buffered_data *in)
 		return;
 	}
 
-	node = canonicalize(conn, vec[0]);
+	node = strstarts(vec[0], "@") ? vec[0] : canonicalize(conn, vec[0]);
 	list_for_each_entry(watch, &conn->watches, list) {
 		if (streq(watch->node, node) && streq(watch->token, vec[1])) {
 			list_del(&watch->list);