X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/2e082dfed76851117cafd488388a010cac25df09..84e9bd3c29059fa73986dc11cfc5fed4e69af184:/ipif/udptunnel-vpn-config.m4?ds=sidebyside diff --git a/ipif/udptunnel-vpn-config.m4 b/ipif/udptunnel-vpn-config.m4 index ddf1de6..4eba63f 100644 --- a/ipif/udptunnel-vpn-config.m4 +++ b/ipif/udptunnel-vpn-config.m4 @@ -1,8 +1,16 @@ m4_dnl udptunnel-vpn-config.m4: macros for udptunnel-reconf et al +m4_dnl This file is part of ipif, part of userv-utils +m4_dnl +m4_dnl Copyright 1996-2013 Ian Jackson +m4_dnl Copyright 1998 David Damerell +m4_dnl Copyright 1999,2003 +m4_dnl Chancellor Masters and Scholars of the University of Cambridge +m4_dnl Copyright 2010 Tony Finch +m4_dnl m4_dnl This is free software; you can redistribute it and/or modify it m4_dnl under the terms of the GNU General Public License as published by -m4_dnl the Free Software Foundation; either version 2 of the License, or +m4_dnl the Free Software Foundation; either version 3 of the License, or m4_dnl (at your option) any later version. m4_dnl m4_dnl This program is distributed in the hope that it will be useful, but @@ -11,10 +19,7 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU m4_dnl General Public License for more details. m4_dnl 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 $Id$ +m4_dnl along with userv-utils; if not, see http://www.gnu.org/licenses/. m4_define(V_JUNK,1)m4_divert(V_JUNK) m4_define(V_VARIABLE,2) @@ -44,7 +49,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 +60,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)