summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2007-08-09 12:02:14 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2007-08-09 12:02:14 (GMT)
commit52140b22af73ac5ae4c6bbbb40217a609614e03f (patch) (side-by-side diff)
treeddaafafcaef3cfd84390d4e275c4bbf2dd36bd37
parent45f180daaf3008a7b2f2d39c07246de1d481669d (diff)
downloadmailfromd-52140b22af73ac5ae4c6bbbb40217a609614e03f.tar.gz
mailfromd-52140b22af73ac5ae4c6bbbb40217a609614e03f.tar.bz2
Use URL instead of FSF address in copyright statements
git-svn-id: file:///svnroot/mailfromd/trunk@1498 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
-rw-r--r--doc/Makefile.am4
-rwxr-xr-xdoc/check-docs.sh4
-rw-r--r--doc/mastermenu.el3
-rw-r--r--elisp/Makefile.am4
-rw-r--r--elisp/mfl-mode.el3
-rw-r--r--etc/Makefile.am4
-rw-r--r--etc/mailfromd.rc4
-rwxr-xr-xetc/rc.in4
-rw-r--r--gacopyz/Makefile.am4
-rw-r--r--gacopyz/context.c4
-rw-r--r--gacopyz/gacopyz.c4
-rw-r--r--gacopyz/gacopyz.h4
-rw-r--r--gacopyz/gacopyz_priv.h4
-rw-r--r--gacopyz/io.c4
-rw-r--r--gacopyz/log.c4
-rw-r--r--gacopyz/proc.c4
-rw-r--r--gacopyz/server.c4
-rw-r--r--gacopyz/smfi.c4
-rw-r--r--gacopyz/trans.awk4
-rw-r--r--gacopyz/trans.tab6
-rw-r--r--mflib/Makefile.am4
-rw-r--r--mflib/dns.mf44
-rw-r--r--mflib/gettext.mf4
-rw-r--r--mflib/heloarg_test.mf4
-rw-r--r--mflib/is_ip.mf4
-rw-r--r--mflib/match_cidr.mf4
-rw-r--r--mflib/match_dnsbl.mf4
-rw-r--r--mflib/match_rhsbl.mf4
-rw-r--r--mflib/pp-setup4
-rw-r--r--mflib/revip.mf4
-rw-r--r--mflib/safedb.mf44
-rw-r--r--mflib/spf.mf4
-rw-r--r--mflib/strip_domain_part.mf4
-rw-r--r--mflib/valid_domain.mf4
-rw-r--r--po/POTFILES.in4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/bi_db.m44
-rw-r--r--src/bi_dns.m44
-rw-r--r--src/bi_gettext.m44
-rw-r--r--src/bi_io.m44
-rw-r--r--src/bi_ipaddr.m44
-rw-r--r--src/bi_mail.m44
-rw-r--r--src/bi_other.m44
-rw-r--r--src/bi_poll.m44
-rw-r--r--src/bi_sa.m44
-rw-r--r--src/bi_spf.m44
-rw-r--r--src/bi_sprintf.m44
-rw-r--r--src/bi_string.m44
-rw-r--r--src/bi_system.m44
-rw-r--r--src/bi_vars.m44
-rw-r--r--src/cache.c4
-rw-r--r--src/db.c4
-rw-r--r--src/debug.cin4
-rw-r--r--src/debug.hin4
-rw-r--r--src/debugdef.m44
-rw-r--r--src/dns.c4
-rw-r--r--src/dns.h4
-rw-r--r--src/dnsbase.c4
-rw-r--r--src/dnscache.c4
-rw-r--r--src/drivers.c4
-rw-r--r--src/drv.awk4
-rw-r--r--src/engine.c4
-rw-r--r--src/gram.y4
-rw-r--r--src/init.m44
-rw-r--r--src/lex.l4
-rw-r--r--src/mailfromd.h4
-rw-r--r--src/main.c4
-rw-r--r--src/mf-status.mfi4
-rw-r--r--src/mfstat.awk4
-rw-r--r--src/mtasim.c4
-rw-r--r--src/mu_dbm.c4
-rw-r--r--src/mu_dbm.h4
-rw-r--r--src/opcode.awk4
-rw-r--r--src/opcodes4
-rw-r--r--src/openat-die.c4
-rw-r--r--src/optab.opc4
-rw-r--r--src/pp.c4
-rw-r--r--src/prog.c4
-rw-r--r--src/prog.h4
-rw-r--r--src/rate.c4
-rw-r--r--src/snarf.m44
-rw-r--r--src/spf.c4
-rw-r--r--src/spf.h4
-rw-r--r--src/stack.c4
-rw-r--r--src/symtab.c4
-rw-r--r--src/version.c4
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/accept.at4
-rw-r--r--tests/ack.at4
-rw-r--r--tests/arg.at4
-rw-r--r--tests/bctx00.at6
-rw-r--r--tests/bctx01.at4
-rw-r--r--tests/catch.at4
-rw-r--r--tests/catch01.at4
-rw-r--r--tests/cidr1.at4
-rw-r--r--tests/cidr2.at4
-rw-r--r--tests/cidr3.at4
-rw-r--r--tests/cond01.at4
-rw-r--r--tests/cond02.at4
-rw-r--r--tests/cond03.at4
-rw-r--r--tests/cond04.at4
-rw-r--r--tests/cond05.at4
-rw-r--r--tests/cond06.at4
-rw-r--r--tests/declvar.at4
-rw-r--r--tests/etc/Makefile.am4
-rw-r--r--tests/etc/ack.rc3
-rw-r--r--tests/etc/arg.rc3
-rw-r--r--tests/etc/catch.rc3
-rw-r--r--tests/etc/catch01.rc3
-rw-r--r--tests/etc/cidr.rc3
-rw-r--r--tests/etc/cond.rc3
-rw-r--r--tests/etc/dns.rc3
-rw-r--r--tests/etc/farg.rc3
-rw-r--r--tests/etc/greylist.rc3
-rw-r--r--tests/etc/macros.rc3
-rw-r--r--tests/etc/ml.rc4
-rw-r--r--tests/etc/numrcpt.rc3
-rw-r--r--tests/etc/poll-1.rc3
-rw-r--r--tests/etc/poll.rc3
-rw-r--r--tests/etc/prec.rc3
-rw-r--r--tests/etc/relayed.rc3
-rw-r--r--tests/etc/sa01.rc3
-rw-r--r--tests/etc/sa02.rc3
-rw-r--r--tests/etc/sa03.rc3
-rw-r--r--tests/etc/sa04.rc3
-rw-r--r--tests/etc/shadow.rc3
-rw-r--r--tests/etc/strings.rc3
-rw-r--r--tests/etc/switch.rc3
-rw-r--r--tests/etc/var.rc3
-rw-r--r--tests/farg.at4
-rw-r--r--tests/fctx00.at6
-rw-r--r--tests/fctx01.at4
-rw-r--r--tests/greylist.at4
-rw-r--r--tests/hasmx.at4
-rw-r--r--tests/hostname.at4
-rw-r--r--tests/invcidr.at4
-rw-r--r--tests/invcidr2.at4
-rw-r--r--tests/invip.at4
-rw-r--r--tests/invip2.at4
-rw-r--r--tests/ismx.at4
-rw-r--r--tests/macros.at6
-rw-r--r--tests/ml.at8
-rw-r--r--tests/numrcpt.at4
-rw-r--r--tests/poll.at4
-rw-r--r--tests/poll01.at4
-rw-r--r--tests/poll02.at4
-rw-r--r--tests/poll03.at4
-rw-r--r--tests/prec.at4
-rw-r--r--tests/reject.at4
-rw-r--r--tests/relayed01.at4
-rw-r--r--tests/relayed02.at4
-rw-r--r--tests/rescname.at4
-rw-r--r--tests/resolve.at4
-rw-r--r--tests/shadow.at8
-rw-r--r--tests/strings.at4
-rw-r--r--tests/switchn1.at4
-rw-r--r--tests/switchn2.at4
-rw-r--r--tests/switchn3.at4
-rw-r--r--tests/switchn4.at4
-rw-r--r--tests/switchs1.at4
-rw-r--r--tests/switchs2.at4
-rw-r--r--tests/switchs3.at4
-rw-r--r--tests/switchs4.at4
-rw-r--r--tests/tempfail.at4
-rw-r--r--tests/testsuite.at4
-rw-r--r--tests/version.at4
168 files changed, 175 insertions, 488 deletions
diff --git a/Makefile.am b/Makefile.am
index 3fbe4bb..04d12ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AUTOMAKE_OPTIONS = gnits 1.8.5 std-options
SUBDIRS = lib gacopyz src mflib elisp po etc doc tests
diff --git a/configure.ac b/configure.ac
index 7668ae0..3f449a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.59)
m4_define([MF_VERSION_MAJOR], 4)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 51e64ae..3ecc4b7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
info_TEXINFOS=mailfromd.texi
mailfromd_TEXINFOS=\
diff --git a/doc/check-docs.sh b/doc/check-docs.sh
index 29579ea..c0b0487 100755
--- a/doc/check-docs.sh
+++ b/doc/check-docs.sh
@@ -13,9 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
usage() {
cat <<EOT
diff --git a/doc/mastermenu.el b/doc/mastermenu.el
index 5f1dbe1..3ab3341 100644
--- a/doc/mastermenu.el
+++ b/doc/mastermenu.el
@@ -19,8 +19,7 @@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software Foundation,
-;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/elisp/Makefile.am b/elisp/Makefile.am
index e96948b..39c8a2f 100644
--- a/elisp/Makefile.am
+++ b/elisp/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
LISPSRC = mfl-mode.el
lisp_LISP=@lisp_LISP@
diff --git a/elisp/mfl-mode.el b/elisp/mfl-mode.el
index 485a65a..a0a1a92 100644
--- a/elisp/mfl-mode.el
+++ b/elisp/mfl-mode.el
@@ -19,8 +19,7 @@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with mailfromd; if not, write to the Free Software Foundation,
-;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;; along with mailfromd. If not, see <http://www.gnu.org/licenses/>.
;; Installation:
;; You may wish to use precompiled version of the module. To create it
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 1e68873..7975f04 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST = mailfromd.rc rc.in sendmail-8.13.7.connect.diff
noinst_SCRIPTS = rc.mailfromd
diff --git a/etc/mailfromd.rc b/etc/mailfromd.rc
index b4f30b3..44be739 100644
--- a/etc/mailfromd.rc
+++ b/etc/mailfromd.rc
@@ -13,9 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#error "Do not use this file 'AS IS'! Tailor it to suit your site!"
diff --git a/etc/rc.in b/etc/rc.in
index 15656cb..1275ce9 100755
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -13,9 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
PIDFILE=<DEFAULT_PIDFILE>
DAEMON=<DEFAULT_DAEMON>
diff --git a/gacopyz/Makefile.am b/gacopyz/Makefile.am
index 38aed24..3ddc0ea 100644
--- a/gacopyz/Makefile.am
+++ b/gacopyz/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
noinst_LIBRARIES = libgacopyz.a
diff --git a/gacopyz/context.c b/gacopyz/context.c
index df13553..8199eb0 100644
--- a/gacopyz/context.c
+++ b/gacopyz/context.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/gacopyz.c b/gacopyz/gacopyz.c
index 151103e..1fff7ed 100644
--- a/gacopyz/gacopyz.c
+++ b/gacopyz/gacopyz.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/gacopyz.h b/gacopyz/gacopyz.h
index b93998e..e52d32f 100644
--- a/gacopyz/gacopyz.h
+++ b/gacopyz/gacopyz.h
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef __gacopyz_h__
# define __gacopyz_h__
diff --git a/gacopyz/gacopyz_priv.h b/gacopyz/gacopyz_priv.h
index eb45237..6686e8a 100644
--- a/gacopyz/gacopyz_priv.h
+++ b/gacopyz/gacopyz_priv.h
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/gacopyz/io.c b/gacopyz/io.c
index 59a8c82..6df22a7 100644
--- a/gacopyz/io.c
+++ b/gacopyz/io.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/log.c b/gacopyz/log.c
index 8f8385d..fcc69ca 100644
--- a/gacopyz/log.c
+++ b/gacopyz/log.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/proc.c b/gacopyz/proc.c
index 8bc7fed..37bb754 100644
--- a/gacopyz/proc.c
+++ b/gacopyz/proc.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/server.c b/gacopyz/server.c
index fbd94f6..9187f10 100644
--- a/gacopyz/server.c
+++ b/gacopyz/server.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/smfi.c b/gacopyz/smfi.c
index fb4ba50..c951aef 100644
--- a/gacopyz/smfi.c
+++ b/gacopyz/smfi.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <gacopyz_priv.h>
diff --git a/gacopyz/trans.awk b/gacopyz/trans.awk
index a60dddb..1d18ba4 100644
--- a/gacopyz/trans.awk
+++ b/gacopyz/trans.awk
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
/#.*/ { sub("#.*","") }
diff --git a/gacopyz/trans.tab b/gacopyz/trans.tab
index 0079d82..089a2ae 100644
--- a/gacopyz/trans.tab
+++ b/gacopyz/trans.tab
@@ -1,5 +1,5 @@
# This file is part of gacopyz.
-# Copyright (C) 2006 Sergey Poznyakoff
+# Copyright (C) 2006, 2007 Sergey Poznyakoff
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# State transition table for milter state machine
diff --git a/mflib/Makefile.am b/mflib/Makefile.am
index 909cf94..e2130ee 100644
--- a/mflib/Makefile.am
+++ b/mflib/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
incdir=$(pkgdatadir)/$(VERSION)/include
inc_DATA =\
diff --git a/mflib/dns.mf4 b/mflib/dns.mf4
index f44a13b..70c295a 100644
--- a/mflib/dns.mf4
+++ b/mflib/dns.mf4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
func hostname (string ipstr) returns string
do
diff --git a/mflib/gettext.mf b/mflib/gettext.mf
index 39601b4..f788438 100644
--- a/mflib/gettext.mf
+++ b/mflib/gettext.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
string mailfromd_domain "mailfromd"
diff --git a/mflib/heloarg_test.mf b/mflib/heloarg_test.mf
index 02ba080..d969c8c 100644
--- a/mflib/heloarg_test.mf
+++ b/mflib/heloarg_test.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#require is_ip
#require dns
diff --git a/mflib/is_ip.mf b/mflib/is_ip.mf
index e0a0c0d..bddbc1d 100644
--- a/mflib/is_ip.mf
+++ b/mflib/is_ip.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#pragma regex push +extended
diff --git a/mflib/match_cidr.mf b/mflib/match_cidr.mf
index ba08632..bb3470a 100644
--- a/mflib/match_cidr.mf
+++ b/mflib/match_cidr.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include_once <status.mfh>
diff --git a/mflib/match_dnsbl.mf b/mflib/match_dnsbl.mf
index 2b7f064..0621a98 100644
--- a/mflib/match_dnsbl.mf
+++ b/mflib/match_dnsbl.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#require dns
#require match_cidr
diff --git a/mflib/match_rhsbl.mf b/mflib/match_rhsbl.mf
index 9154be7..9b2a492 100644
--- a/mflib/match_rhsbl.mf
+++ b/mflib/match_rhsbl.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#require dns
#require match_cidr
diff --git a/mflib/pp-setup b/mflib/pp-setup
index 0d81215..b27e17a 100644
--- a/mflib/pp-setup
+++ b/mflib/pp-setup
@@ -13,9 +13,7 @@ divert(-1) dnl -*- m4 -*-
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
changecom(/*,*/)
diff --git a/mflib/revip.mf b/mflib/revip.mf
index 1f3ed33..5e41c05 100644
--- a/mflib/revip.mf
+++ b/mflib/revip.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
func revip(string ip) returns string
do
diff --git a/mflib/safedb.mf4 b/mflib/safedb.mf4
index 3653289..f1d98b8 100644
--- a/mflib/safedb.mf4
+++ b/mflib/safedb.mf4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program . If not, see <http://www.gnu.org/licenses/>. */
#include_once <status.mfh>
diff --git a/mflib/spf.mf b/mflib/spf.mf
index 63b043d..74bb25d 100644
--- a/mflib/spf.mf
+++ b/mflib/spf.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#require safedb
#pragma regex push +extended +icase
diff --git a/mflib/strip_domain_part.mf b/mflib/strip_domain_part.mf
index 1f23889..c58a031 100644
--- a/mflib/strip_domain_part.mf
+++ b/mflib/strip_domain_part.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#pragma regex push +extended
diff --git a/mflib/valid_domain.mf b/mflib/valid_domain.mf
index e2e7c86..5fc3634 100644
--- a/mflib/valid_domain.mf
+++ b/mflib/valid_domain.mf
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#require dns
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 158e7fc..70dc6d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,9 +13,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Library files
lib/argp-parse.c
diff --git a/src/Makefile.am b/src/Makefile.am
index bf6f004..fe86d2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
sbin_PROGRAMS = mailfromd
bin_PROGRAMS = mtasim
diff --git a/src/bi_db.m4 b/src/bi_db.m4
index 537ec8c..bb0b9f4 100644
--- a/src/bi_db.m4
+++ b/src/bi_db.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define LOOKUP_NULL_BYTE 0x1
#define LOOKUP_TEST_ONLY 0x2
diff --git a/src/bi_dns.m4 b/src/bi_dns.m4
index e48c59a..7e92c96 100644
--- a/src/bi_dns.m4
+++ b/src/bi_dns.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/src/bi_gettext.m4 b/src/bi_gettext.m4
index 3450d9f..aeb008c 100644
--- a/src/bi_gettext.m4
+++ b/src/bi_gettext.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
MF_DEFUN(bindtextdomain, STRING, STRING domain, STRING dirname)
{
diff --git a/src/bi_io.m4 b/src/bi_io.m4
index 64d229d..d660ca6 100644
--- a/src/bi_io.m4
+++ b/src/bi_io.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/src/bi_ipaddr.m4 b/src/bi_ipaddr.m4
index 8267781..44b5b10 100644
--- a/src/bi_ipaddr.m4
+++ b/src/bi_ipaddr.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/src/bi_mail.m4 b/src/bi_mail.m4
index bb7e788..8b106d8 100644
--- a/src/bi_mail.m4
+++ b/src/bi_mail.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
static int
_send(eval_environ_t env,
diff --git a/src/bi_other.m4 b/src/bi_other.m4
index 1e4a98c..7d1ec7e 100644
--- a/src/bi_other.m4
+++ b/src/bi_other.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
static int
valid_user_p(eval_environ_t env, const char *name)
diff --git a/src/bi_poll.m4 b/src/bi_poll.m4
index 9d37aaa..979ffd8 100644
--- a/src/bi_poll.m4
+++ b/src/bi_poll.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
MF_VAR(last_poll_host, STRING);
MF_VAR(last_poll_send, STRING);
diff --git a/src/bi_sa.m4 b/src/bi_sa.m4
index 65c8f45..0ed7472 100644
--- a/src/bi_sa.m4
+++ b/src/bi_sa.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <unistd.h>
#include <stdlib.h>
diff --git a/src/bi_spf.m4 b/src/bi_spf.m4
index 92be15c..0680521 100644
--- a/src/bi_spf.m4
+++ b/src/bi_spf.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "spf.h"
diff --git a/src/bi_sprintf.m4 b/src/bi_sprintf.m4
index b840726..3f3f434 100644
--- a/src/bi_sprintf.m4
+++ b/src/bi_sprintf.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define FMT_ALTPOS 0x01
#define FMT_ALTERNATE 0x02
diff --git a/src/bi_string.m4 b/src/bi_string.m4
index 264503c..82aa30d 100644
--- a/src/bi_string.m4
+++ b/src/bi_string.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
MF_DEFUN(toupper, STRING, STRING string)
{
diff --git a/src/bi_system.m4 b/src/bi_system.m4
index aa3327b..ebf00da 100644
--- a/src/bi_system.m4
+++ b/src/bi_system.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "strftime.h"
diff --git a/src/bi_vars.m4 b/src/bi_vars.m4
index df54938..2c1a07c 100644
--- a/src/bi_vars.m4
+++ b/src/bi_vars.m4
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
MF_VAR(rcpt_count, NUMBER);
MF_VAR(ehlo_domain, STRING);
diff --git a/src/cache.c b/src/cache.c
index 10f8a9a..26a0c80 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_CACHE
diff --git a/src/db.c b/src/db.c
index 9552a20..d8efaa6 100644
--- a/src/db.c
+++ b/src/db.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_DB
diff --git a/src/debug.cin b/src/debug.cin
index 848521f..a9704b3 100644
--- a/src/debug.cin
+++ b/src/debug.cin
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/debug.hin b/src/debug.hin
index c60f364..9d0c8b7 100644
--- a/src/debug.hin
+++ b/src/debug.hin
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
MAKEDEBUGSYM(SRCLIST)
diff --git a/src/debugdef.m4 b/src/debugdef.m4
index c9c2812..cf1af8a 100644
--- a/src/debugdef.m4
+++ b/src/debugdef.m4
@@ -13,9 +13,7 @@ divert(-1)
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
changequote([<,>])
changecom(/*,*/)
diff --git a/src/dns.c b/src/dns.c
index a627110..3bebe6a 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_DNS
diff --git a/src/dns.h b/src/dns.h
index c989092..9e816fb 100644
--- a/src/dns.h
+++ b/src/dns.h
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
typedef enum {
dns_success,
diff --git a/src/dnsbase.c b/src/dnsbase.c
index b38d012..7290fc4 100644
--- a/src/dnsbase.c
+++ b/src/dnsbase.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_DNSBASE
diff --git a/src/dnscache.c b/src/dnscache.c
index 6a0aad7..f5d7acf 100644
--- a/src/dnscache.c
+++ b/src/dnscache.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_DNSCACHE
diff --git a/src/drivers.c b/src/drivers.c
index ea15063..278dbb6 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MARK_LOCUS() \
do if (!*old_locus || !LOCUS_EQ(*old_locus, &node->locus)) { \
diff --git a/src/drv.awk b/src/drv.awk
index b54979a..18fc931 100644
--- a/src/drv.awk
+++ b/src/drv.awk
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
/\f/ { node=""; }
diff --git a/src/engine.c b/src/engine.c
index 9c82a54..1801fde 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_ENGINE
diff --git a/src/gram.y b/src/gram.y
index 4aae821..35ba557 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -13,9 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_GRAM
diff --git a/src/init.m4 b/src/init.m4
index 9ee9e53..df81997 100644
--- a/src/init.m4
+++ b/src/init.m4
@@ -13,9 +13,7 @@ m4_divert(-1)
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4_changequote([<,>])
m4_changecom(/*,*/)
diff --git a/src/lex.l b/src/lex.l
index 03bfe6a..7b043bf 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -13,9 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_LEX
diff --git a/src/mailfromd.h b/src/mailfromd.h
index 26df373..2f6c5a5 100644
--- a/src/mailfromd.h
+++ b/src/mailfromd.h
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/types.h>
#include <regex.h>
diff --git a/src/main.c b/src/main.c
index 559939a..78c2aca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_MAIN
diff --git a/src/mf-status.mfi b/src/mf-status.mfi
index 539b04a..7687e1a 100644
--- a/src/mf-status.mfi
+++ b/src/mf-status.mfi
@@ -13,9 +13,7 @@ TEMPLATE /* */ -*- c -*-
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/mfstat.awk b/src/mfstat.awk
index 2db8bcf..1e396ed 100644
--- a/src/mfstat.awk
+++ b/src/mfstat.awk
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
BEGIN {
header[nh++] = "-*- buffer-read-only: t -*- vi: set ro:"
diff --git a/src/mtasim.c b/src/mtasim.c
index 8ebd0fa..94f53e1 100644
--- a/src/mtasim.c
+++ b/src/mtasim.c
@@ -13,9 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/mu_dbm.c b/src/mu_dbm.c
index ce1f774..9ee8765 100644
--- a/src/mu_dbm.c
+++ b/src/mu_dbm.c
@@ -13,9 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GNU Mailutils; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_MU_DBM
diff --git a/src/mu_dbm.h b/src/mu_dbm.h
index 21925b9..2a7c6c1 100644
--- a/src/mu_dbm.h
+++ b/src/mu_dbm.h
@@ -13,9 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GNU Mailutils; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
#include <mailutils/stream.h>
diff --git a/src/opcode.awk b/src/opcode.awk
index d268eef..8680c4d 100644
--- a/src/opcode.awk
+++ b/src/opcode.awk
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
BEGIN {
header[nh++] = "-*- buffer-read-only: t -*- vi: set ro:"
diff --git a/src/opcodes b/src/opcodes
index 1197225..b8dd588 100644
--- a/src/opcodes
+++ b/src/opcodes
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Opcode Dump function Number of words
diff --git a/src/openat-die.c b/src/openat-die.c
index 6d0bb09..9a3d367 100644
--- a/src/openat-die.c
+++ b/src/openat-die.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/optab.opc b/src/optab.opc
index 37178cd..d76fddb 100644
--- a/src/optab.opc
+++ b/src/optab.opc
@@ -13,9 +13,7 @@ TEMPLATE /* */ -*- c -*-
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/pp.c b/src/pp.c
index 11cea14..48177f0 100644
--- a/src/pp.c
+++ b/src/pp.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_PP
diff --git a/src/prog.c b/src/prog.c
index ae06cbf..169ef26 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_PROG
diff --git a/src/prog.h b/src/prog.h
index f7002c0..955f54d 100644
--- a/src/prog.h
+++ b/src/prog.h
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
struct optab {
char *name;
diff --git a/src/rate.c b/src/rate.c
index 070b765..a4fbc42 100644
--- a/src/rate.c
+++ b/src/rate.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_RATE
diff --git a/src/snarf.m4 b/src/snarf.m4
index e42b9e5..f8aae79 100644
--- a/src/snarf.m4
+++ b/src/snarf.m4
@@ -13,9 +13,7 @@ m4_divert(-1)m4_dnl -*- m4 -*-
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
m4_changequote([<,>])
m4_changecom(/*,*/)
diff --git a/src/spf.c b/src/spf.c
index 6640e34..060a333 100644
--- a/src/spf.c
+++ b/src/spf.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define MF_SOURCE_NAME MF_SOURCE_SPF
diff --git a/src/spf.h b/src/spf.h
index b6b4035..003d758 100644
--- a/src/spf.h
+++ b/src/spf.h
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define SPF_MAX_TXT_REC 10
#define SPF_MAX_RECURSION 10
diff --git a/src/stack.c b/src/stack.c
index 3242847..6b4c6bd 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/symtab.c b/src/symtab.c
index 54a69e2..841d6cd 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/src/version.c b/src/version.c
index abf9836..7fa7c7f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -12,9 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a68a272..e5221d9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
DISTCLEANFILES = atconfig $(check_SCRIPTS)
diff --git a/tests/accept.at b/tests/accept.at
index 5ba4435..fb16cf0 100644
--- a/tests/accept.at
+++ b/tests/accept.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Accept action])
AT_KEYWORDS([actions accept])
diff --git a/tests/ack.at b/tests/ack.at
index 8b411ef..5220098 100644
--- a/tests/ack.at
+++ b/tests/ack.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Ackerman function])
AT_KEYWORDS([ack])
diff --git a/tests/arg.at b/tests/arg.at
index 428042d..f3d824c 100644
--- a/tests/arg.at
+++ b/tests/arg.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Function arguments])
AT_KEYWORDS([arg])
diff --git a/tests/bctx00.at b/tests/bctx00.at
index d94b32e..a95cf83 100644
--- a/tests/bctx00.at
+++ b/tests/bctx00.at
@@ -12,14 +12,12 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Builtin in wrong context])
AT_KEYWORDS([context builtin-context bctx bctx00])
-echo "mailfromd: $ETCDIR/sa01.rc:20: Built-in function \`sa' cannot be used in prog \`envfrom'" > experr
+echo "mailfromd: $ETCDIR/sa01.rc:19: Built-in function \`sa' cannot be used in prog \`envfrom'" > experr
AT_CHECK([mailfromd $MFOPTS --test $ETCDIR/sa01.rc],
[78],
diff --git a/tests/bctx01.at b/tests/bctx01.at
index 8ffeaeb..2bb8e31 100644
--- a/tests/bctx01.at
+++ b/tests/bctx01.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Builtin in correct context])
AT_KEYWORDS([context builtin-context bctx bctx01])
diff --git a/tests/catch.at b/tests/catch.at
index f1b02f2..d67de67 100644
--- a/tests/catch.at
+++ b/tests/catch.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Setting exceptions])
AT_KEYWORDS([exceptions catch setex])
diff --git a/tests/catch01.at b/tests/catch01.at
index 9d3cacc..ea4958a 100644
--- a/tests/catch01.at
+++ b/tests/catch01.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Setting exceptions (2)])
AT_KEYWORDS([exceptions catch setex2])
diff --git a/tests/cidr1.at b/tests/cidr1.at
index d1b9ff2..c4bc30d 100644
--- a/tests/cidr1.at
+++ b/tests/cidr1.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([cidr: 10.10.0.1 matches 10.10.0.0/19])
AT_KEYWORDS([cidr cidr1])
diff --git a/tests/cidr2.at b/tests/cidr2.at
index 5b57e9a..76788bb 100644
--- a/tests/cidr2.at
+++ b/tests/cidr2.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([cidr: 10.10.31.255 matches 10.10.0.0/19])
AT_KEYWORDS([cidr cidr2])
diff --git a/tests/cidr3.at b/tests/cidr3.at
index f12dfc4..e996a26 100644
--- a/tests/cidr3.at
+++ b/tests/cidr3.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([cidr: 10.10.32.1 does not match 10.10.0.0/19])
AT_KEYWORDS([cidr cidr3])
diff --git a/tests/cond01.at b/tests/cond01.at
index 2348882..eeba4b3 100644
--- a/tests/cond01.at
+++ b/tests/cond01.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([String equality])
AT_KEYWORDS([cond cond01])
diff --git a/tests/cond02.at b/tests/cond02.at
index ccf920c..4c061a1 100644
--- a/tests/cond02.at
+++ b/tests/cond02.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Fnmatch])
AT_KEYWORDS([cond cond02 fnmatch fnmatch1])
diff --git a/tests/cond03.at b/tests/cond03.at
index 4e261c1..cfd7211 100644
--- a/tests/cond03.at
+++ b/tests/cond03.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Fnmatch (2)])
AT_KEYWORDS([cond cond02 fnmatch fnmatch2])
diff --git a/tests/cond04.at b/tests/cond04.at
index 67e4e5d..1f9cf73 100644
--- a/tests/cond04.at
+++ b/tests/cond04.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Regex match])
AT_KEYWORDS([cond cond04 regex regex1])
diff --git a/tests/cond05.at b/tests/cond05.at
index 4e5f627..e92e456 100644
--- a/tests/cond05.at
+++ b/tests/cond05.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Regex match (5)])
AT_KEYWORDS([cond cond05 regex regex2])
diff --git a/tests/cond06.at b/tests/cond06.at
index 8316860..7649fac 100644
--- a/tests/cond06.at
+++ b/tests/cond06.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Nested if])
AT_KEYWORDS([cond cond06 nested])
diff --git a/tests/declvar.at b/tests/declvar.at
index c3c1004..5faefab 100644
--- a/tests/declvar.at
+++ b/tests/declvar.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Declared variables])
AT_KEYWORDS([declvar variable variables])
diff --git a/tests/etc/Makefile.am b/tests/etc/Makefile.am
index f5cc5b4..32ebb3e 100644
--- a/tests/etc/Makefile.am
+++ b/tests/etc/Makefile.am
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
RCFILES=\
accept.rc\
diff --git a/tests/etc/ack.rc b/tests/etc/ack.rc
index b11bd3b..4f24da2 100644
--- a/tests/etc/ack.rc
+++ b/tests/etc/ack.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
/* This test computes the value of Ackerman function ack(3,8), which
diff --git a/tests/etc/arg.rc b/tests/etc/arg.rc
index 2dacce6..10d8a49 100644
--- a/tests/etc/arg.rc
+++ b/tests/etc/arg.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog envfrom
diff --git a/tests/etc/catch.rc b/tests/etc/catch.rc
index 4eb264e..70be959 100644
--- a/tests/etc/catch.rc
+++ b/tests/etc/catch.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#include_once <status.mfh>
#require match_cidr
diff --git a/tests/etc/catch01.rc b/tests/etc/catch01.rc
index 88c0d2a..6820be9 100644
--- a/tests/etc/catch01.rc
+++ b/tests/etc/catch01.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#include_once <status.mfh>
#require match_cidr
diff --git a/tests/etc/cidr.rc b/tests/etc/cidr.rc
index 722adb7..231dc18 100644
--- a/tests/etc/cidr.rc
+++ b/tests/etc/cidr.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#require match_cidr
diff --git a/tests/etc/cond.rc b/tests/etc/cond.rc
index 8345e56..c4dd648 100644
--- a/tests/etc/cond.rc
+++ b/tests/etc/cond.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog envrcpt
do
diff --git a/tests/etc/dns.rc b/tests/etc/dns.rc
index d3ef3d8..c06d176 100644
--- a/tests/etc/dns.rc
+++ b/tests/etc/dns.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#include "config.rc"
diff --git a/tests/etc/farg.rc b/tests/etc/farg.rc
index a1f8b78..cc3cda7 100644
--- a/tests/etc/farg.rc
+++ b/tests/etc/farg.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
# Check that both old and new-style function declarations produce
# equal results.
diff --git a/tests/etc/greylist.rc b/tests/etc/greylist.rc
index 22d7334..facdc3e 100644
--- a/tests/etc/greylist.rc
+++ b/tests/etc/greylist.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#include "config.rc"
diff --git a/tests/etc/macros.rc b/tests/etc/macros.rc
index 3f396c0..1df7234 100644
--- a/tests/etc/macros.rc
+++ b/tests/etc/macros.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
func patchstring() returns string
do
diff --git a/tests/etc/ml.rc b/tests/etc/ml.rc
index 7ad7144..01532d6 100644
--- a/tests/etc/ml.rc
+++ b/tests/etc/ml.rc
@@ -13,8 +13,6 @@ do
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
EOT
done
diff --git a/tests/etc/numrcpt.rc b/tests/etc/numrcpt.rc
index 711f923..7373a71 100644
--- a/tests/etc/numrcpt.rc
+++ b/tests/etc/numrcpt.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog envrcpt
do
diff --git a/tests/etc/poll-1.rc b/tests/etc/poll-1.rc
index 1ed2e2d..fbdbb31 100644
--- a/tests/etc/poll-1.rc
+++ b/tests/etc/poll-1.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#include_once <status.mfh>
diff --git a/tests/etc/poll.rc b/tests/etc/poll.rc
index 723ad81..e4f30f9 100644
--- a/tests/etc/poll.rc
+++ b/tests/etc/poll.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
#include <status.mfh>
diff --git a/tests/etc/prec.rc b/tests/etc/prec.rc
index 08943e0..f25a081 100644
--- a/tests/etc/prec.rc
+++ b/tests/etc/prec.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
# Test function precedence: calls without parentheses have the lowest
# precedence, calls with them have the highest. The test below
diff --git a/tests/etc/relayed.rc b/tests/etc/relayed.rc
index e9d4b19..40d60fe 100644
--- a/tests/etc/relayed.rc
+++ b/tests/etc/relayed.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog helo
diff --git a/tests/etc/sa01.rc b/tests/etc/sa01.rc
index 2e14f1f..66a72fa 100644
--- a/tests/etc/sa01.rc
+++ b/tests/etc/sa01.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog envfrom
do
diff --git a/tests/etc/sa02.rc b/tests/etc/sa02.rc
index 8951918..fc0b03a 100644
--- a/tests/etc/sa02.rc
+++ b/tests/etc/sa02.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog eom
do
diff --git a/tests/etc/sa03.rc b/tests/etc/sa03.rc
index 10143e0..c7d4403 100644
--- a/tests/etc/sa03.rc
+++ b/tests/etc/sa03.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
func sa_wrap(string url)
do
diff --git a/tests/etc/sa04.rc b/tests/etc/sa04.rc
index ee1049b..07618e8 100644
--- a/tests/etc/sa04.rc
+++ b/tests/etc/sa04.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
func sa_wrap(string url)
do
diff --git a/tests/etc/shadow.rc b/tests/etc/shadow.rc
index 427f582..5b3449a 100644
--- a/tests/etc/shadow.rc
+++ b/tests/etc/shadow.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
set x "initial"
diff --git a/tests/etc/strings.rc b/tests/etc/strings.rc
index ee05a8b..64defac 100644
--- a/tests/etc/strings.rc
+++ b/tests/etc/strings.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
set x "string of rings"
set gnu "GNU"
diff --git a/tests/etc/switch.rc b/tests/etc/switch.rc
index 5ff8780..f7749e1 100644
--- a/tests/etc/switch.rc
+++ b/tests/etc/switch.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
prog envfrom
do
diff --git a/tests/etc/var.rc b/tests/etc/var.rc
index 97f5dcf..56dade6 100644
--- a/tests/etc/var.rc
+++ b/tests/etc/var.rc
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Mailfromd; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ along with Mailfromd. If not, see <http://www.gnu.org/licenses/>. */
set str "String"
diff --git a/tests/farg.at b/tests/farg.at
index 3d2d363..26bec00 100644
--- a/tests/farg.at
+++ b/tests/farg.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Function arguments])
AT_KEYWORDS([farg])
diff --git a/tests/fctx00.at b/tests/fctx00.at
index 62ce50e..9c4f96d 100644
--- a/tests/fctx00.at
+++ b/tests/fctx00.at
@@ -12,14 +12,12 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Function in wrong context])
AT_KEYWORDS([context function-context fctx fctx00])
-echo "mailfromd: $ETCDIR/sa03.rc:28: Function \`sa_wrap' cannot be used in prog \`envfrom'" > experr
+echo "mailfromd: $ETCDIR/sa03.rc:27: Function \`sa_wrap' cannot be used in prog \`envfrom'" > experr
AT_CHECK([mailfromd $MFOPTS --test $ETCDIR/sa03.rc],
[78],
diff --git a/tests/fctx01.at b/tests/fctx01.at
index c47b56f..6aadd55 100644
--- a/tests/fctx01.at
+++ b/tests/fctx01.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Function in correct context])
AT_KEYWORDS([context function-context fctx fctx01])
diff --git a/tests/greylist.at b/tests/greylist.at
index fbedd76..95e65f6 100644
--- a/tests/greylist.at
+++ b/tests/greylist.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Greylisting])
AT_KEYWORDS([greylist])
diff --git a/tests/hasmx.at b/tests/hasmx.at
index 1396b82..63c028a 100644
--- a/tests/hasmx.at
+++ b/tests/hasmx.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Hasmx call])
AT_KEYWORDS([dns hasmx])
diff --git a/tests/hostname.at b/tests/hostname.at
index 59e75d5..424ca9d 100644
--- a/tests/hostname.at
+++ b/tests/hostname.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Resolve cname])
AT_KEYWORDS([dns rescname])
diff --git a/tests/invcidr.at b/tests/invcidr.at
index 133fdde..a4d3159 100644
--- a/tests/invcidr.at
+++ b/tests/invcidr.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Catching exceptions: invcidr])
AT_KEYWORDS([exceptions catch invcidr])
diff --git a/tests/invcidr2.at b/tests/invcidr2.at
index b4801dc..18f038d 100644
--- a/tests/invcidr2.at
+++ b/tests/invcidr2.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Catching exceptions: invcidr (2)])
AT_KEYWORDS([exceptions catch invcidr2])
diff --git a/tests/invip.at b/tests/invip.at
index 7e49691..0265294 100644
--- a/tests/invip.at
+++ b/tests/invip.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Catching exceptions: invip])
AT_KEYWORDS([exceptions catch invip])
diff --git a/tests/invip2.at b/tests/invip2.at
index d1b04a6..7796901 100644
--- a/tests/invip2.at
+++ b/tests/invip2.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Catching exceptions: invip (2)])
AT_KEYWORDS([exceptions catch invip2])
diff --git a/tests/ismx.at b/tests/ismx.at
index 42bcfa9..163eb65 100644
--- a/tests/ismx.at
+++ b/tests/ismx.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Ismx call])
AT_KEYWORDS([dns ismx])
diff --git a/tests/macros.at b/tests/macros.at
index 41b5765..af342ba 100644
--- a/tests/macros.at
+++ b/tests/macros.at
@@ -12,14 +12,12 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Built-in macros])
AT_KEYWORDS([macros])
-echo "$ETCDIR/macros.rc:29: this is mailfromd AT_PACKAGE_VERSION" > experr
+echo "$ETCDIR/macros.rc:28: this is mailfromd AT_PACKAGE_VERSION" > experr
AT_CHECK([mailfromd $MFOPTS --test $ETCDIR/macros.rc],
[0],
diff --git a/tests/ml.at b/tests/ml.at
index f862d7d..e9bc467 100644
--- a/tests/ml.at
+++ b/tests/ml.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Multiline strings])
AT_KEYWORDS([ml multiline multi-line])
@@ -32,9 +30,7 @@ AT_CHECK([mailfromd $MFOPTS --test $ETCDIR/ml.rc],
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
State envfrom: reject
])
diff --git a/tests/numrcpt.at b/tests/numrcpt.at
index 5f73307..18a01c1 100644
--- a/tests/numrcpt.at
+++ b/tests/numrcpt.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([rcpt_count])
AT_KEYWORDS([rcpt_count numrcpt])
diff --git a/tests/poll.at b/tests/poll.at
index 676c68b..2f5caad 100644
--- a/tests/poll.at
+++ b/tests/poll.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([poll: Existing sender])
AT_KEYWORDS([poll exist poll00])
diff --git a/tests/poll01.at b/tests/poll01.at
index e7b2a05..2058312 100644
--- a/tests/poll01.at
+++ b/tests/poll01.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([poll: Non-existing sender])
AT_KEYWORDS([poll non-exist poll01])
diff --git a/tests/poll02.at b/tests/poll02.at
index 4bf42ca..257a6f6 100644
--- a/tests/poll02.at
+++ b/tests/poll02.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([poll: Tempfail])
AT_KEYWORDS([poll tempfail poll02])
diff --git a/tests/poll03.at b/tests/poll03.at
index 94cce11..e447316 100644
--- a/tests/poll03.at
+++ b/tests/poll03.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([poll: Multiple from addresses])
AT_KEYWORDS([poll multiple poll03])
diff --git a/tests/prec.at b/tests/prec.at
index 30d25bf..7c1d5a8 100644
--- a/tests/prec.at
+++ b/tests/prec.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([function precedence])
AT_KEYWORDS([fprec prec])
diff --git a/tests/reject.at b/tests/reject.at
index fd80074..13424a7 100644
--- a/tests/reject.at
+++ b/tests/reject.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Reject action])
AT_KEYWORDS([actions reject])
diff --git a/tests/relayed01.at b/tests/relayed01.at
index 149c210..44f70ca 100644
--- a/tests/relayed01.at
+++ b/tests/relayed01.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Relayed: Not a relayed host])
AT_KEYWORDS([relayed relayed01])
diff --git a/tests/relayed02.at b/tests/relayed02.at
index 532c848..04a0a23 100644
--- a/tests/relayed02.at
+++ b/tests/relayed02.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Relayed: Relayed host])
AT_KEYWORDS([relayed relayed02])
diff --git a/tests/rescname.at b/tests/rescname.at
index 43140ea..f36199d 100644
--- a/tests/rescname.at
+++ b/tests/rescname.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Resolve cname ])
AT_KEYWORDS([dns rescname])
diff --git a/tests/resolve.at b/tests/resolve.at
index d74a212..aaafa77 100644
--- a/tests/resolve.at
+++ b/tests/resolve.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Resolve])
AT_KEYWORDS([dns resolve])
diff --git a/tests/shadow.at b/tests/shadow.at
index f53c666..631fc4d 100644
--- a/tests/shadow.at
+++ b/tests/shadow.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([variable shadowing])
AT_KEYWORDS([variable variables shadow])
@@ -22,8 +20,8 @@ AT_KEYWORDS([variable variables shadow])
prog=$ETCDIR/shadow.rc
cat > experr <<EOT
-mailfromd: $prog:20: Warning: Parameter \`x' is shadowing a global
-mailfromd: $prog:28: Warning: Automatic variable \`x' is shadowing a global
+mailfromd: $prog:19: Warning: Parameter \`x' is shadowing a global
+mailfromd: $prog:27: Warning: Automatic variable \`x' is shadowing a global
param
auto text
initial
diff --git a/tests/strings.at b/tests/strings.at
index cce8ec3..ea5c395 100644
--- a/tests/strings.at
+++ b/tests/strings.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([String functions])
AT_KEYWORDS([string strings string-functions strfunc])
diff --git a/tests/switchn1.at b/tests/switchn1.at
index c4212de..ac9f260 100644
--- a/tests/switchn1.at
+++ b/tests/switchn1.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Numeric switch: Branch 1,2 val 1])
AT_KEYWORDS([switch numswitch switchn1])
diff --git a/tests/switchn2.at b/tests/switchn2.at
index 31a4201..fb04023 100644
--- a/tests/switchn2.at
+++ b/tests/switchn2.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Numeric switch: Branch 1,2 val 1])
AT_KEYWORDS([switch numswitch switchn2])
diff --git a/tests/switchn3.at b/tests/switchn3.at
index 666a46b..721189a 100644
--- a/tests/switchn3.at
+++ b/tests/switchn3.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Numeric switch: Branch 3])
AT_KEYWORDS([switch numswitch switchn3])
diff --git a/tests/switchn4.at b/tests/switchn4.at
index 48bc027..0b6b659 100644
--- a/tests/switchn4.at
+++ b/tests/switchn4.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Numeric switch: Default branch])
AT_KEYWORDS([switch numswitch switchn4])
diff --git a/tests/switchs1.at b/tests/switchs1.at
index a1ebe98..a110be0 100644
--- a/tests/switchs1.at
+++ b/tests/switchs1.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([String switch: Branch 1,2 val jeden])
AT_KEYWORDS([switch strswitch switchs1])
diff --git a/tests/switchs2.at b/tests/switchs2.at
index 84d454b..ace4e70 100644
--- a/tests/switchs2.at
+++ b/tests/switchs2.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([String switch: Branch 1,2 val dwa])
AT_KEYWORDS([switch strswitch switchs2])
diff --git a/tests/switchs3.at b/tests/switchs3.at
index 7921f36..8229c73 100644
--- a/tests/switchs3.at
+++ b/tests/switchs3.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([String switch: Branch 3])
AT_KEYWORDS([switch strswitch switchs3])
diff --git a/tests/switchs4.at b/tests/switchs4.at
index db53b11..ba0bc84 100644
--- a/tests/switchs4.at
+++ b/tests/switchs4.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([String switch: Default branch])
AT_KEYWORDS([switch strswitch switchs4])
diff --git a/tests/tempfail.at b/tests/tempfail.at
index b39c353..e7f02ad 100644
--- a/tests/tempfail.at
+++ b/tests/tempfail.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([Tempfail action])
AT_KEYWORDS([actions tempfail])
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 423778e..6329e6a 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# We need a recent Autotest.
m4_version_prereq([2.52g])
diff --git a/tests/version.at b/tests/version.at
index 4f44998..e02d50a 100644
--- a/tests/version.at
+++ b/tests/version.at
@@ -12,9 +12,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([mailfromd version])

Return to:

Send suggestions and report system problems to the System administrator.