summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2009-04-15 22:00:31 +0000
committerCédric Krier <cedk@gentoo.org>2009-04-15 22:00:31 +0000
commit0d110c0997eb8a7b1987c40265239d6f2627ae4d (patch)
tree0cfe0832e4ae3f7b41a410e05def189470e2bc59 /net-misc/openvpn
parentRun eautoreconf, bug #255857 (diff)
downloadgentoo-2-0d110c0997eb8a7b1987c40265239d6f2627ae4d.tar.gz
gentoo-2-0d110c0997eb8a7b1987c40265239d6f2627ae4d.tar.bz2
gentoo-2-0d110c0997eb8a7b1987c40265239d6f2627ae4d.zip
Fix up.sh to add search for all domains for bug #259382
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'net-misc/openvpn')
-rw-r--r--net-misc/openvpn/ChangeLog5
-rwxr-xr-xnet-misc/openvpn/files/up.sh2
2 files changed, 5 insertions, 2 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 5cce7d022266..57e8fcd885de 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openvpn
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.142 2009/01/03 18:36:43 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.143 2009/04/15 22:00:31 cedk Exp $
+
+ 15 Apr 2009; Cédric Krier <cedk@gentoo.org> files/up.sh:
+ Fix up.sh to add search for all domains for bug #259382
*openvpn-2.1_rc15 (03 Jan 2009)
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
index d0879b83c08d..c47c34aabad4 100755
--- a/net-misc/openvpn/files/up.sh
+++ b/net-misc/openvpn/files/up.sh
@@ -31,7 +31,7 @@ if [ "${PEER_DNS}" != "no" ]; then
if [ -z "${DOMAIN}" ] ; then
DOMAIN="${opt#dhcp-option DOMAIN *}"
else
- SEARCH="${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
+ SEARCH="${SEARCH}${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
fi
elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"