From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Nov 2016 11:28:10 +0000 (+0000)
Subject: nntpid: Chiark::NNTP: spot if cat /etc/nntpserver fails
X-Git-Tag: archive/debian/5.0.0~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;ds=sidebyside;h=0858876b9824c1ad47b63d27df25b38a743cfe71;hp=ec02a236b401d8e072e6d6ea9b870133fb2802f0;p=chiark-utils.git

nntpid: Chiark::NNTP: spot if cat /etc/nntpserver fails

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/scripts/Chiark/NNTP.pm b/scripts/Chiark/NNTP.pm
index f31652e..4ccfa4a 100644
--- a/scripts/Chiark/NNTP.pm
+++ b/scripts/Chiark/NNTP.pm
@@ -54,7 +54,9 @@ sub cnntp_connect ($) {
 
     my $ns=$ENV{'NNTPSERVER'};
     if (!defined $ns or !length $ns) {
+	$? = 0;
 	$ns = `cat /etc/nntpserver`;
+	die if $?;
 	chomp($ns);
     }
     my $port = (getservbyname("nntp", "tcp"))[2];