Gentoo Archives: gentoo-commits

From:	"Cedric Krier (cedk)" <cedk@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in net-misc/openvpn/files: up.sh
Date:	Thu, 28 May 2009 17:57:08
Message-Id:	`E1M9jqj-0004XX-DU@stork.gentoo.org`

1	cedk 09/05/28 17:57:05
2
3	Modified: up.sh
4	Log:
5	Fix invalid resolv.conf when DOMAIN is empty for bug #269614
6	(Portage version: 2.1.6.11/cvs/Linux i686)
7
8	Revision Changes Path
9	1.15 net-misc/openvpn/files/up.sh
10
11	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openvpn/files/up.sh?rev=1.15&view=markup
12	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openvpn/files/up.sh?rev=1.15&content-type=text/plain
13	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openvpn/files/up.sh?r1=1.14&r2=1.15
14
15	Index: up.sh
16	===================================================================
17	RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/files/up.sh,v
18	retrieving revision 1.14
19	retrieving revision 1.15
20	diff -u -r1.14 -r1.15
21	--- up.sh 15 Apr 2009 22:00:31 -0000 1.14
22	+++ up.sh 28 May 2009 17:57:05 -0000 1.15
23	@@ -43,7 +43,7 @@
24	DNS="# Generated by openvpn for interface ${dev}\n"
25	if [ -n "${SEARCH}" ] ; then
26	DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
27	- else
28	+ elif [ -n "${DOMAIN}" ]; then
29	DNS="${DNS}domain ${DOMAIN}\n"
30	fi
31	DNS="${DNS}${NS}"