[Xen-changelog] [xen-unstable] Fix xenstore unwatch with node name starting with "@"

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1192611769 -3600
# Node ID 86bd91e90eec5da1dce9f25cd101a7034dec67cc
# Parent  786a210e7cab4a5a882cb2fcdeea831a72755163
Fix xenstore unwatch with node name starting with "@"
Watch node starting with "@" should not be canonicalized.
Signed-off-by: Xiaowei Yang <xiaowei.yang@xxxxxxxxx>
---
 tools/xenstore/xenstored_watch.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 786a210e7cab -r 86bd91e90eec tools/xenstore/xenstored_watch.c
--- a/tools/xenstore/xenstored_watch.c  Wed Oct 17 10:00:27 2007 +0100
+++ b/tools/xenstore/xenstored_watch.c  Wed Oct 17 10:02:49 2007 +0100
@@ -170,7 +170,7 @@ void do_unwatch(struct connection *conn,
                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);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog