Index: /trunk/packages/invirt-remote/debian/changelog
===================================================================
--- /trunk/packages/invirt-remote/debian/changelog	(revision 2092)
+++ /trunk/packages/invirt-remote/debian/changelog	(revision 2093)
@@ -1,2 +1,9 @@
+invirt-remote (0.3.2) unstable; urgency=low
+
+  * Don't pass untrusted arguments to xm info.
+  * Exit with a non-0 error code on the host if there's an error.
+
+ -- Evan Broder <broder@mit.edu>  Sat, 31 Jan 2009 03:51:24 -0500
+
 invirt-remote (0.3.1) unstable; urgency=low
 
Index: /trunk/packages/invirt-remote/host/usr/sbin/invirt-remote
===================================================================
--- /trunk/packages/invirt-remote/host/usr/sbin/invirt-remote	(revision 2092)
+++ /trunk/packages/invirt-remote/host/usr/sbin/invirt-remote	(revision 2093)
@@ -22,5 +22,5 @@
 	        ;;
 	    info)
-		COMMAND=/usr/sbin/xm
+		exec /usr/sbin/xm info
 		;;
             vnccert)
@@ -39,3 +39,3 @@
 esac
 
-$COMMAND "$SERVICE" "$@"
+exec "$COMMAND" "$SERVICE" "$@"
Index: /trunk/packages/invirt-remote/host/usr/sbin/invirt-vmcontrol
===================================================================
--- /trunk/packages/invirt-remote/host/usr/sbin/invirt-vmcontrol	(revision 2092)
+++ /trunk/packages/invirt-remote/host/usr/sbin/invirt-vmcontrol	(revision 2093)
@@ -12,4 +12,8 @@
 ACTION="$2"
 MACHINE="d_$ORIGMACHINE"
+
+xm () {
+    command xm "$@" || exit 35
+}
 
 case "$ACTION" in