diff -r c6776b6da8ee tools/xenstore/xenstore_client.c
--- a/tools/xenstore/xenstore_client.c	Wed Nov 14 23:35:43 2007 +0000
+++ b/tools/xenstore/xenstore_client.c	Fri Feb 01 22:17:48 2008 +0100
@@ -350,7 +350,9 @@ main(int argc, char **argv)
 
     xsh = socket ? xs_daemon_open() : xs_domain_open();
     if (xsh == NULL)
-	err(1, socket ? "xs_daemon_open" : "xs_domain_open");
+	xsh = socket ? xs_domain_open() : xs_daemon_open();
+    if (xsh == NULL)
+	err(1, "xs_*_open");
 
   again:
     if (transaction) {