From: Sapan Bhatia <gwsapan@gmail.com>
Date: Thu, 14 Mar 2013 18:10:10 +0000 (-0400)
Subject: Without this, scp, ssh with bash arguments etc. does not work
X-Git-Tag: lxctools-0.9-5~2
X-Git-Url: http://git.onelab.eu/?p=lxc-userspace.git;a=commitdiff_plain;h=9c6440a4f7565e7e8ce0a7fcd1a964b26e9b17f4

Without this, scp, ssh with bash arguments etc. does not work
---

diff --git a/vsh.c b/vsh.c
index 8780b24..03e7566 100644
--- a/vsh.c
+++ b/vsh.c
@@ -45,7 +45,7 @@ char **extend_argv(int argc, char **argv, int num_extra_args) {
     return argv2;
 }
 
-#define NUM_LXCSU_EXEC_ARGS 1
+#define NUM_LXCSU_EXEC_ARGS 2
 
 int main(int argc, char **argv, char **envp)
 {
@@ -70,6 +70,7 @@ int main(int argc, char **argv, char **envp)
     snprintf(slice_id_str, 255, "%u", slice_xid);
     argv2[0] = strdup(LXCSU_PATH);
     argv2[1] = strdup(slice_name);
+    argv2[2] = strdup("--");
 
     if (setuid(geteuid())) goto out_exception;