etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-7124: Fix semicolon caused VPN programming issue" 

This reverts commit 809b47e4eb.

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

Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
This commit is contained in:
Sheng Yang 2014-07-25 14:10:09 -07:00
parent 717e697246
commit f4757a198a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java
View File

@ -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 ";