@@ -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-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.
 
  --
   * www-cgi passes HTTP_COOKIE header.
 
  --

diff --git a/ipif/udptunnel-vpn-config.m4 b/ipif/udptunnel-vpn-config.m4
index c0bf3bb9676b4506620248d3b511b1bd30bb3943..0fd45fd617c419d2fd91818b16eb949d576f4450 100644 (file)
--- a/ipif/udptunnel-vpn-config.m4
+++ b/ipif/udptunnel-vpn-config.m4
@@ -14,7 +14,7 @@ m4_dnl You should have received a copy of the GNU General Public License
 m4_dnl along with userv-utils; if not, write to the Free Software
 m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 m4_dnl
 m4_dnl along with userv-utils; if not, write to the Free Software
 m4_dnl Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 m4_dnl

-m4_dnl $Id: udptunnel-vpn-config.m4,v 1.2 2000/12/11 02:41:27 ian Exp $
+m4_dnl $Id: udptunnel-vpn-config.m4,v 1.3 2001/09/26 00:19:47 ian Exp $

 
 m4_define(V_JUNK,1)m4_divert(V_JUNK)
 m4_define(V_VARIABLE,2)
 
 m4_define(V_JUNK,1)m4_divert(V_JUNK)
 m4_define(V_VARIABLE,2)


@@ -44,7 +44,6 @@ m4_divert(V_JUNK)
 
 V_YES
 m4_include(V_defaults)
 
 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
 
 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_tunnels)
 

+V_YES
+m4_include(V_global)
+

 m4_divert(V_VARIABLE)
 WHVARIABLE
 m4_divert(V_JUNK)
 m4_divert(V_VARIABLE)
 WHVARIABLE
 m4_divert(V_JUNK)