From 664c8b3b2ca7a757535ce3490a387aacc9fbd2f8 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Wed, 18 Jul 2012 12:26:24 -0700
Subject: [PATCH] CS-15511: Fix parameter transfer in bash

---
 .../resource/virtualnetwork/VirtualRoutingResource.java     | 6 +++---
 .../cloud/hypervisor/vmware/resource/VmwareResource.java    | 6 +++---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java   | 6 +++---
 patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh | 2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 7c9deaead76..9c5bbc4e5fe 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -559,13 +559,13 @@ public class VirtualRoutingResource implements Manager {
             args += " -N ";
 	        args += cmd.getPeerGuestCidrList();
             args += " -e ";
-	        args += cmd.getEspPolicy();
+	        args += "\"" + cmd.getEspPolicy() + "\"";
             args += " -i ";
-	        args += cmd.getIkePolicy();
+	        args += "\"" + cmd.getIkePolicy() + "\"";
             args += " -t ";
 	        args += Long.toString(cmd.getLifetime());
             args += " -s ";
-	        args += cmd.getIpsecPsk();
+	        args += "\"" + cmd.getIpsecPsk() + "\"";
         } else {
             args = "-D";
             args += " -r ";
diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index f44286d8985..0ae711a2ad0 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1024,13 +1024,13 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
             args += " -N ";
 	        args += cmd.getPeerGuestCidrList();
             args += " -e ";
-	        args += cmd.getEspPolicy();
+	        args += "\"" + cmd.getEspPolicy() + "\"";
             args += " -i ";
-	        args += cmd.getIkePolicy();
+	        args += "\"" + cmd.getIkePolicy() + "\"";
             args += " -t ";
 	        args += Long.toString(cmd.getLifetime());
             args += " -s ";
-	        args += cmd.getIpsecPsk();
+	        args += "\"" + cmd.getIpsecPsk() + "\"";
         } else {
             args += " -D";
             args += " -r ";
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 678e896a094..1be8e131830 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7360,13 +7360,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             args += " -N ";
 	        args += cmd.getPeerGuestCidrList();
             args += " -e ";
-	        args += cmd.getEspPolicy();
+	        args += "\"" + cmd.getEspPolicy() + "\"";
             args += " -i ";
-	        args += cmd.getIkePolicy();
+	        args += "\"" + cmd.getIkePolicy() + "\"";
             args += " -t ";
 	        args += Long.toString(cmd.getLifetime());
             args += " -s ";
-	        args += cmd.getIpsecPsk();
+	        args += "\"" + cmd.getIpsecPsk() + "\"";
         } else {
             args += " -D";
             args += " -r ";
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh b/patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh
index 6edcd22af6e..9283c2acc6a 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh
@@ -190,6 +190,8 @@ do
   esac
 done
 
+logger -t cloud "$(basename $0): parameters $*"
+
 # get interface for public ip
 ip link|grep BROADCAST|grep -v eth0|cut -d ":" -f 2 > /tmp/iflist
 while read i