Changeset 2097 for trunk/packages/invirt-remote

Timestamp:

Feb 5, 2009, 3:24:56 AM (16 years ago)

Author:

broder

Message:

For now, revert r2093-2095, which were committed by accident; I'm not
comfortable with them sitting on HEAD when I don't have time to test
them.

Location:

trunk/packages/invirt-remote

Files:

• debian/changelog (modified) (1 diff)
• host/usr/sbin/invirt-remote (modified) (2 diffs)
• host/usr/sbin/invirt-vmcontrol (modified) (1 diff)
• server/usr/sbin/invirt-remote-proxy (modified) (1 diff)

trunk/packages/invirt-remote/debian/changelog

@@ -1 @@
-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.
-  * Always exec instead of fork&exec on the remctl server so that return
-    codes get passed on.
-
- -- Evan Broder <broder@mit.edu>  Sat, 31 Jan 2009 03:51:54 -0500
-
 invirt-remote (0.3.1) unstable; urgency=low
 

trunk/packages/invirt-remote/host/usr/sbin/invirt-remote

@@ -22 +22 @@
                 ;;
             info)
-                exec /usr/sbin/xm info
+                COMMAND=/usr/sbin/xm
                 ;;
             vnccert)
@@ -39 +39 @@
 esac
 
-exec "$COMMAND" "$SERVICE" "$@"
+$COMMAND "$SERVICE" "$@"

trunk/packages/invirt-remote/host/usr/sbin/invirt-vmcontrol

@@ -12 +12 @@
 ACTION="$2"
 MACHINE="d_$ORIGMACHINE"
-
-xm () {
-    command xm "$@" || exit 35
-}
 
 case "$ACTION" in

trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-proxy

@@ -14 +14 @@
 case "$TYPE/$SERVICE" in
     web/listvms )
-        exec invirt-remote-listvms "$@" ;;
+        invirt-remote-listvms "$@" ;;
     web/vnccert )
-        exec invirt-remote-vnccert "$@" ;;
+        invirt-remote-vnccert "$@" ;;
     control/help )
-        exec invirt-remctl-help ;;
+        invirt-remctl-help ;;
     control/create|control/install )
-        exec invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
+        invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
     control/listhost|control/list-host )
-        exec invirt-remote-listhost "$MACHINE" "$@" ;;
+        invirt-remote-listhost "$MACHINE" "$@" ;;
     control/* )
         # Everything but create must go where the VM is already running.
-        exec invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
+        invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
     * )
-        exec remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
+        remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
 esac