From 947ef3322ece5a0825c1add4c8b979b1814674df Mon Sep 17 00:00:00 2001
Message-Id: <947ef3322ece5a0825c1add4c8b979b1814674df.1715798529.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 26 Sep 2001 00:12:14 +0000
Subject: [PATCH] @@ -2,6 +2,7 @@ +  * udptunnel-reconf understands
 forbid_remote set to `-'.
Organization: Straylight/Edgeware

From: ian <ian>

---
 changelog                | 1 +
 ipif/udptunnel-reconf.pl | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 9bde270..efda190 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ userv-utils (0.2.2) unstable; urgency=low
 
   * udptunnel-reconf default script pauses for 10s between restarts.
   * udptunnel-reconf inittab entries default to having </dev/null.
+  * udptunnel-reconf understands forbid_remote set to `-'.
   * www-cgi passes HTTP_COOKIE header.
 
  --
diff --git a/ipif/udptunnel-reconf.pl b/ipif/udptunnel-reconf.pl
index 4e1a9aa..489593d 100755
--- a/ipif/udptunnel-reconf.pl
+++ b/ipif/udptunnel-reconf.pl
@@ -17,7 +17,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: udptunnel-reconf.pl,v 1.2 2000/12/11 02:41:27 ian Exp $
+# $Id: udptunnel-reconf.pl,v 1.3 2001/09/26 00:12:14 ian Exp $
 
 use Socket;
 
@@ -96,8 +96,10 @@ sub parse_addr_mask ($) {
 
 $forbid_remote= var_global('forbid_remote');
 @forbid_remote= ();
-foreach $r (split /[, \t]+/, $forbid_remote) {
-    push @forbid_remote, [ parse_addr_mask($r) ];
+if ($forbid_remote ne '-') {
+    foreach $r (split /[, \t]+/, $forbid_remote) {
+	push @forbid_remote, [ parse_addr_mask($r) ];
+    }
 }
 
 sub ipif_permit ($$$$) {
-- 
[mdw]