@@ -3,6 +3,7 @@

+  * forbid_remote is a per-tunnel option.

diff --git a/changelog b/changelog
index efda19098d3e7770bdb807abd59276dca7b9f877..68efa1b8257de12fe2decb3cdc3e02027fd6f9a4 100644 (file)
--- a/changelog
+++ b/changelog
@@ -3,6 +3,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 `-'.
+  * forbid_remote is a per-tunnel option.
   * www-cgi passes HTTP_COOKIE header.
 
  --

diff --git a/debian/changelog b/debian/changelog
index efda19098d3e7770bdb807abd59276dca7b9f877..68efa1b8257de12fe2decb3cdc3e02027fd6f9a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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 `-'.
+  * forbid_remote is a per-tunnel option.
   * www-cgi passes HTTP_COOKIE header.
 
  --

diff --git a/ipif/udptunnel-reconf.pl b/ipif/udptunnel-reconf.pl
index 7fd14bc59643fe360cb6885b2fe2cddf2fd185ca..ea4c86f0d337f80ce7d29921bb90eeee9f1473be 100755 (executable)
--- a/ipif/udptunnel-reconf.pl
+++ b/ipif/udptunnel-reconf.pl
@@ -94,14 +94,6 @@ sub parse_addr_mask ($) {
     return ($iaddr, $mask);
 }
 
-$forbid_remote= var_global('forbid_remote');
-@forbid_remote= ();
-if ($forbid_remote ne '-') {
-    foreach $r (split /[, \t]+/, $forbid_remote) {
-       push @forbid_remote, [ parse_addr_mask($r) ];
-    }
-}
-
 sub ipif_permit ($$$$) {
     my ($group,$local,$net,$why) = @_;
     my ($pmask,$piaddr,$fmask,$fiaddr,@lgroup,$lgid);
@@ -133,6 +125,14 @@ if ($glend !~ m/^V_/ && $glgroup !~ m/^V_/ &&
 }
 
 foreach $site (@actives, @passives) {
+    $forbid_remote= var_site('forbid_remote');
+    @forbid_remote= ();
+    if ($forbid_remote ne '-') {
+       foreach $r (split /[, \t]+/, $forbid_remote) {
+           push @forbid_remote, [ parse_addr_mask($r) ];
+       }
+    }
+
     $tlend= var_site('lend')."/32";
     $tlgroup= var_site('lgroup');
     if ($tlend ne $glend || $tlgroup ne $glgroup) {