@@ -4,6 +4,7 @@

+  * udptunnel-vpn-config.m4 allows global file to override as intended.

diff --git a/changelog b/changelog
index 68efa1b8257de12fe2decb3cdc3e02027fd6f9a4..d2bbbd2f72992abfd3347c21b6327a5bfcbd056f 100644 (file)
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ userv-utils (0.2.2) unstable; urgency=low
   * udptunnel-reconf inittab entries default to having </dev/null.
   * udptunnel-reconf understands forbid_remote set to `-'.
   * forbid_remote is a per-tunnel option.
+  * udptunnel-vpn-config.m4 allows global file to override as intended.
   * www-cgi passes HTTP_COOKIE header.
 
  --

diff --git a/debian/changelog b/debian/changelog
index 68efa1b8257de12fe2decb3cdc3e02027fd6f9a4..d2bbbd2f72992abfd3347c21b6327a5bfcbd056f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ userv-utils (0.2.2) unstable; urgency=low
   * udptunnel-reconf inittab entries default to having </dev/null.
   * udptunnel-reconf understands forbid_remote set to `-'.
   * forbid_remote is a per-tunnel option.
+  * udptunnel-vpn-config.m4 allows global file to override as intended.
   * www-cgi passes HTTP_COOKIE header.
 
  --

diff --git a/ipif/udptunnel-vpn-config.m4 b/ipif/udptunnel-vpn-config.m4
index ddf1de62ff3b90059b9177a6dd49b5e78c275be1..2f70960bd47580b15fb6539d1bf743bffedf89e2 100644 (file)
--- a/ipif/udptunnel-vpn-config.m4
+++ b/ipif/udptunnel-vpn-config.m4
@@ -44,7 +44,6 @@ m4_divert(V_JUNK)
 
 V_YES
 m4_include(V_defaults)
-m4_include(V_global)
 
 V_WARGS(SITE, 1, [m4_ifelse([$1],V_site, [V_YES], [V_NO])])
 V_YES
@@ -56,6 +55,9 @@ V_ACTPA(PASSIVE)
 V_YES
 m4_include(V_tunnels)
 
+V_YES
+m4_include(V_global)
+
 m4_divert(V_VARIABLE)
 WHVARIABLE
 m4_divert(V_JUNK)