cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject [2/2] git commit: updated refs/heads/master to f4757a1
Date Fri, 25 Jul 2014 22:22:13 GMT
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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4757a19
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4757a19
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4757a19

Branch: refs/heads/master
Commit: f4757a198a95e71dc3b5f8d42ac2c88e0b74d590
Parents: 717e697
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Fri Jul 25 14:10:09 2014 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Fri Jul 25 14:10:35 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4757a19/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java b/core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
index a065a02..92d8329 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 ";


Mime
View raw message