diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2009-05-28 17:57:05 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2009-05-28 17:57:05 +0000 |
| commit | ad6de7277a4e24da6146190f1a306efd4af0942b (patch) | |
| tree | 6a1667dc24e7a687ef432194e39ed1f76567128d /net-misc | |
| parent | Fix alignment (bug #270867). (diff) | |
| download | gentoo-2-ad6de7277a4e24da6146190f1a306efd4af0942b.tar.gz gentoo-2-ad6de7277a4e24da6146190f1a306efd4af0942b.tar.bz2 gentoo-2-ad6de7277a4e24da6146190f1a306efd4af0942b.zip | |
Fix invalid resolv.conf when DOMAIN is empty for bug #269614
(Portage version: 2.1.6.11/cvs/Linux i686)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openvpn/ChangeLog | 5 | ||||
| -rwxr-xr-x | net-misc/openvpn/files/up.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 57e8fcd885de..c929304d3d94 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.143 2009/04/15 22:00:31 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.144 2009/05/28 17:57:04 cedk Exp $ + + 28 May 2009; Cédric Krier <cedk@gentoo.org> files/up.sh: + Fix invalid resolv.conf when DOMAIN is empty for bug #269614 15 Apr 2009; Cédric Krier <cedk@gentoo.org> files/up.sh: Fix up.sh to add search for all domains for bug #259382 diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh index c47c34aabad4..4a8868702de5 100755 --- a/net-misc/openvpn/files/up.sh +++ b/net-misc/openvpn/files/up.sh @@ -43,7 +43,7 @@ if [ "${PEER_DNS}" != "no" ]; then DNS="# Generated by openvpn for interface ${dev}\n" if [ -n "${SEARCH}" ] ; then DNS="${DNS}search ${DOMAIN} ${SEARCH}\n" - else + elif [ -n "${DOMAIN}" ]; then DNS="${DNS}domain ${DOMAIN}\n" fi DNS="${DNS}${NS}" |