[packages/perl-Net-DNS.git] / perl-Net-DNS-ignore-resolv_conf-open-errors.patch

diff -ruN Net-DNS-0.83.orig/lib/Net/DNS/Resolver/UNIX.pm Net-DNS-0.83/lib/Net/DNS/Resolver/UNIX.pm
--- Net-DNS-0.83.orig/lib/Net/DNS/Resolver/UNIX.pm	2015-02-26 16:01:55.000000000 +0100
+++ Net-DNS-0.83/lib/Net/DNS/Resolver/UNIX.pm	2015-03-06 12:37:21.217583476 +0100
@@ -32,7 +32,17 @@
 sub init {
 	my $defaults = shift->defaults;
 
+	eval {
 	$defaults->read_config_file($resolv_conf) if -f $resolv_conf && -r _;
+	};
+	if ( $@ ) {
+		if ( $@ =~ /^Could not open / ) {
+			# we ignore this problem
+			#warn "$@";
+		} else {
+			die $@;
+		}
+	}
 
 	$defaults->domain( _untaint $defaults->domain );	# untaint config values
 	$defaults->searchlist( _untaint $defaults->searchlist );
Commit	Line	Data
a385dcbc AO	1	diff -ruN Net-DNS-0.83.orig/lib/Net/DNS/Resolver/UNIX.pm Net-DNS-0.83/lib/Net/DNS/Resolver/UNIX.pm
	2	--- Net-DNS-0.83.orig/lib/Net/DNS/Resolver/UNIX.pm 2015-02-26 16:01:55.000000000 +0100
	3	+++ Net-DNS-0.83/lib/Net/DNS/Resolver/UNIX.pm 2015-03-06 12:37:21.217583476 +0100
	4	@@ -32,7 +32,17 @@
ad250853	5	sub init {
a385dcbc	6	my $defaults = shift->defaults;
7c0bd538	7
ad250853	8	+ eval {
a385dcbc	9	$defaults->read_config_file($resolv_conf) if -f $resolv_conf && -r _;
ad250853	10	+ };
	11	+ if ( $@ ) {
	12	+ if ( $@ =~ /^Could not open / ) {
	13	+ # we ignore this problem
	14	+ #warn "$@";
	15	+ } else {
	16	+ die $@;
	17	+ }
	18	+ }
7c0bd538	19
a385dcbc AO	20	$defaults->domain( _untaint $defaults->domain ); # untaint config values
a385dcbc AO	21	$defaults->searchlist( _untaint $defaults->searchlist );