From f4757a198a95e71dc3b5f8d42ac2c88e0b74d590 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Fri, 25 Jul 2014 14:10:09 -0700
Subject: [PATCH] Revert "CLOUDSTACK-7124: Fix semicolon caused VPN programming
 issue"

This reverts commit 809b47e4eb2a99248ad122499e288610a5cd12ad.

Because the fix cause CLOUDSTACK-7163. Would fix it in another way.

Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
---
 .../cloud/agent/resource/virtualnetwork/ConfigHelper.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
index a065a0228ac..92d83295065 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
@@ -456,11 +456,10 @@ public class ConfigHelper {
             args += cmd.getPeerGatewayIp();
             args += " -N ";
             args += cmd.getPeerGuestCidrList();
-            // escape semicolon which may cause issue in bash
             args += " -e ";
-            args += "\"" + cmd.getEspPolicy().replaceAll(";", "\\\\;") + "\"";
+            args += "\"" + cmd.getEspPolicy() + "\"";
             args += " -i ";
-            args += "\"" + cmd.getIkePolicy().replaceAll(";", "\\\\;") + "\"";
+            args += "\"" + cmd.getIkePolicy() + "\"";
             args += " -t ";
             args += Long.toString(cmd.getIkeLifetime());
             args += " -T ";