cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to 6d469a3
Date Thu, 28 May 2015 13:05:50 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 fc2c53963 -> 6d469a393


Always enter chap-secrets as a quoted field. In the event of special characters it creates
and deletes the entry properly, in the event there are not special characters there is no
change behavior.

Signed-off-by: Remi Bergsma <apache@remi.nl>

This closes #307


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

Branch: refs/heads/4.4
Commit: 6d469a393514453755fb96ad981aca4d4668980d
Parents: fc2c539
Author: David Bierce <david.bierce@appcore.com>
Authored: Tue May 26 14:07:44 2015 -0500
Committer: Daan Hoogland <daan@onecht.net>
Committed: Thu May 28 15:05:34 2015 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d469a39/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh b/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
index 83d5272..7796b29 100755
--- a/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
+++ b/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh
@@ -170,11 +170,11 @@ add_l2tp_ipsec_user() {
    local u=$1
    local passwd=$2
 
-   uptodate=$(grep "^$u \* $passwd \*$" /etc/ppp/chap-secrets)
+   uptodate=$(grep "^$u \* \"$passwd\" \*$" /etc/ppp/chap-secrets)
    if [ "$uptodate" == "" ]
    then
        remove_l2tp_ipsec_user $u
-       echo "$u * $passwd *" >> /etc/ppp/chap-secrets
+       echo "$u * \"$passwd\" *" >> /etc/ppp/chap-secrets
    fi
 }
 


Mime
View raw message