cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject git commit: updated refs/heads/master to 646e0d9
Date Wed, 27 May 2015 11:49:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ce9014d2e -> 646e0d99d


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/646e0d99
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/646e0d99
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/646e0d99

Branch: refs/heads/master
Commit: 646e0d99dd8c2220ff6ea82283f7bd0890fc4b62
Parents: ce9014d
Author: David Bierce <david.bierce@appcore.com>
Authored: Tue May 26 14:07:44 2015 -0500
Committer: Remi Bergsma <apache@remi.nl>
Committed: Wed May 27 13:42:48 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/646e0d99/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 7fb44e6..83cf4de 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