From 45e13c4b105757ac0fa1f1cbdeed9d74c22bfec4 Mon Sep 17 00:00:00 2001
From: Evan Broder <broder@mit.edu>
Date: Thu, 5 Feb 2009 03:19:28 -0500
Subject: [PATCH] Always exec instead of fork&exec on the remctl server so
 that return codes get passed on.

svn path=/trunk/packages/invirt-remote/; revision=2094
---
 debian/changelog                    |    4 +++-
 server/usr/sbin/invirt-remote-proxy |   14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbf50b7..92d081e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ 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:24 -0500
+ -- Evan Broder <broder@mit.edu>  Sat, 31 Jan 2009 03:51:54 -0500
 
 invirt-remote (0.3.1) unstable; urgency=low
 
diff --git a/server/usr/sbin/invirt-remote-proxy b/server/usr/sbin/invirt-remote-proxy
index f05fa65..d84fe81 100755
--- a/server/usr/sbin/invirt-remote-proxy
+++ b/server/usr/sbin/invirt-remote-proxy
@@ -13,18 +13,18 @@ esac
 
 case "$TYPE/$SERVICE" in
     web/listvms )
-	invirt-remote-listvms "$@" ;;
+	exec invirt-remote-listvms "$@" ;;
     web/vnccert )
-        invirt-remote-vnccert "$@" ;;
+        exec invirt-remote-vnccert "$@" ;;
     control/help )
-        invirt-remctl-help ;;
+        exec invirt-remctl-help ;;
     control/create|control/install )
-	invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
+	exec invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
     control/listhost|control/list-host )
-	invirt-remote-listhost "$MACHINE" "$@" ;;
+	exec invirt-remote-listhost "$MACHINE" "$@" ;;
     control/* )
 	# Everything but create must go where the VM is already running.
-	invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
+	exec invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
     * )
-	remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
+	exec remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
 esac
-- 
1.7.9.5