summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-07-06 18:47:16 +0000
committerRoy Marples <uberlord@gentoo.org>2006-07-06 18:47:16 +0000
commitd0c9ac37442c4268cd1785e4ae05c91afa357c83 (patch)
treee0b02ec3445efaaeca916a73e2449df0e14d50a0 /net-misc/openvpn
parentadded perl-app to inherit wrt bug# 69329 (diff)
downloadgentoo-2-d0c9ac37442c4268cd1785e4ae05c91afa357c83.tar.gz
gentoo-2-d0c9ac37442c4268cd1785e4ae05c91afa357c83.tar.bz2
gentoo-2-d0c9ac37442c4268cd1785e4ae05c91afa357c83.zip
Allow periods in config names, #139454 thanks to Ed Catmur.
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'net-misc/openvpn')
-rw-r--r--net-misc/openvpn/ChangeLog6
-rwxr-xr-xnet-misc/openvpn/files/openvpn-2.1.init2
-rw-r--r--net-misc/openvpn/files/openvpn.init2
3 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 2a21b5a957a2..c538e8ced113 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openvpn
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.89 2006/06/29 09:34:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.90 2006/07/06 18:47:16 uberlord Exp $
+
+ 06 Jul 2006; Roy Marples <uberlord@gentoo.org> files/openvpn-2.1.init,
+ files/openvpn.init:
+ Allow periods in config names, #139454 thanks to Ed Catmur.
*openvpn-2.0.7 (29 Jun 2006)
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init
index b0bc7ad76349..f20bbb17febd 100755
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ b/net-misc/openvpn/files/openvpn-2.1.init
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
VPNDIR="${VPNDIR:-/etc/openvpn}"
-VPN="${SVCNAME##*.}"
+VPN="${SVCNAME#*.}"
if [[ -n ${VPN} && ${SVCNAME} != "openvpn" ]]; then
VPNPID="/var/run/openvpn.${VPN}.pid"
else
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
index 20c8788096a9..809df9bec2df 100644
--- a/net-misc/openvpn/files/openvpn.init
+++ b/net-misc/openvpn/files/openvpn.init
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
VPNDIR="/etc/openvpn"
-VPN="${SVCNAME##*.}"
+VPN="${SVCNAME#*.}"
if [[ -n ${VPN} && ${SVCNAME} != "openvpn" ]]; then
VPNPID="/var/run/openvpn.${VPN}.pid"
else