v2.1

2019-09-27 12:00:00 +00:00 · 2019-09-27 12:00:00 +00:00 · b0a0cb1b42
commit b0a0cb1b42
parent 604786202d
566 changed files with 20941 additions and 15706 deletions
--- a/17
+++ b/17
@ -1,6 +1,23 @@
 E-MailRelay Change Log
 ======================

+2.0.1 -> 2.1
+------------
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New "--idle-timeout" option for server-side connections.
+* Support for RFC-5782 DNSBL blocking ("--dnsbl").
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be editied by "--client-filter" scripts.
+* Better support for CRAM-SHAx authentication.
+* New "--client-auth-config" and "--server-auth-config" options.
+* New "--show" option on windows to better control the user interface style.
+* The "--pop" option always requires "--pop-auth".
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS cipher name added to "Received" line as per RFC-8314 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
 2.0 -> 2.0.1
 ------------
 * Make PLAIN client authentication work against servers with broken 334 responses.
--- a/Makefile.am
+++ b/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
@ -19,7 +19,7 @@
 #
 # Additional pseudo-targets for packaging:
 #	* rpm - builds an rpm package using rpmbuild
-#	* deb - converts the rpm to a deb package using alien.
+#	* deb - builds a deb package using debhelper
 #
 # When running "make distcheck" consider doing this to avoid
 # a lengthy testing stage:
@ -53,36 +53,41 @@ uninstall-local:
 	-for try in 1 2 3 4 ; do echo "$(e_pamdir)" "$(e_initdir)" "$(e_sysconfdir)" "$(e_examplesdir)" "$(e_libexecdir)" "$(e_spooldir)" "$(e_docdir)" "$(pkgdatadir)" | tr ' ' '\n' | grep "emailrelay$" | while read d ; do rmdir "$(DESTDIR)/$$d" 2>/dev/null ; done ; done

 RPM_ROOT ?= ${HOME}/rpmbuild
-#RPM_ARCH ?= $(shell arch)
-RPM_ARCH ?= x86_64
-RPM=$(RPM_ROOT)/RPMS/$(RPM_ARCH)/emailrelay-$(VERSION)-1.$(RPM_ARCH).rpm
-DEB=emailrelay_$(VERSION)-1_$(RPM_ARCH).deb
+#ARCH ?= $(shell arch)
+ARCH ?= x86_64
+RPM=$(RPM_ROOT)/RPMS/$(ARCH)/emailrelay-$(VERSION)-1.$(ARCH).rpm
 TAR=emailrelay-$(VERSION).tar.gz
+DEB=emailrelay_$(VERSION)_$(ARCH).deb

 .PHONY: rpm
 rpm: $(RPM)

 $(RPM): dist
-	-rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)
+	-rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)-1.$(ARCH)
+	test ! -d $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)-1.$(ARCH)
 	-mkdir -p $(RPM_ROOT)/BUILD $(RPM_ROOT)/SOURCES $(RPM_ROOT)/SPECS 2>/dev/null
 	cp $(TAR) $(RPM_ROOT)/SOURCES/emailrelay-$(VERSION)-src.tar.gz
 	cp $(top_srcdir)/emailrelay.spec $(RPM_ROOT)/SPECS/
-	chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec
-	-rm -f $(RPM) || true
+	-chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec
+	-rm -f $(RPM)
+	test ! -f $(RPM)
 	rpmbuild -ba $(RPM_ROOT)/SPECS/emailrelay.spec
 	test -f $(RPM)

 .PHONY: deb
 deb: $(DEB)

-$(DEB): $(RPM)
+$(DEB): dist
 	-mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$$$ || true
-	alien --to-deb --generate --single --keep-version $(RPM)
-	sed -i 's/^Section:.*/Section: mail/' emailrelay-$(VERSION)/debian/control
-	sed -i 's/^Maintainer:.*/Maintainer: Graeme Walker <graeme_walker@users.sourceforge.net>/' emailrelay-$(VERSION)/debian/control
-	chmod +x $(top_srcdir)/debian/pre* $(top_srcdir)/debian/post*
-	cp $(top_srcdir)/debian/* emailrelay-$(VERSION)/debian/
-	sed -i 's:dh_installchangelogs:dh_installchangelogs ; cp etc/init.d/emailrelay debian/emailrelay.init ; dh_installinit:' emailrelay-$(VERSION)/debian/rules
-	sed -i 's:dh_installdeb:dh_installdeb ; echo /etc/emailrelay.conf > debian/emailrelay/DEBIAN/conffiles:' emailrelay-$(VERSION)/debian/rules
-	cd emailrelay-$(VERSION) && debian/rules binary
+	tar xzf $(TAR)
+	cd emailrelay-$(VERSION) && fakeroot debian/rules binary
+	mkdir emailrelay-$(VERSION)/debian/source
+
+.PHONY: deb-src
+deb-src: dist
+	-mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$$$ || true
+	tar xzf $(TAR)
+	mkdir emailrelay-$(VERSION)/debian/source
+	echo 1.0 > emailrelay-$(VERSION)/debian/source/format
+	dpkg-source --build emailrelay-$(VERSION)

--- a/Makefile.in
+++ b/Makefile.in
@ -21,7 +21,7 @@
 #
 # Additional pseudo-targets for packaging:
 #	* rpm - builds an rpm package using rpmbuild
-#	* deb - converts the rpm to a deb package using alien.
+#	* deb - builds a deb package using debhelper
 #
 # When running "make distcheck" consider doing this to avoid
 # a lengthy testing stage:
@ -102,10 +102,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@ -203,7 +203,7 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gconfig_defs.h.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS README compile depcomp \
+	AUTHORS COPYING ChangeLog INSTALL NEWS README compile \
 	install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@ -260,6 +260,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -268,15 +269,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -342,6 +341,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
@ -391,9 +391,9 @@ SUBDIRS = bin src etc doc debian test m4 bsd
 # work-round PKG_CHECK_MODULES if no pkg-config
 ACLOCAL_AMFLAGS = -I m4
 e_doc_DATA = COPYING AUTHORS INSTALL NEWS README ChangeLog
-RPM = $(RPM_ROOT)/RPMS/$(RPM_ARCH)/emailrelay-$(VERSION)-1.$(RPM_ARCH).rpm
-DEB = emailrelay_$(VERSION)-1_$(RPM_ARCH).deb
+RPM = $(RPM_ROOT)/RPMS/$(ARCH)/emailrelay-$(VERSION)-1.$(ARCH).rpm
 TAR = emailrelay-$(VERSION).tar.gz
+DEB = emailrelay_$(VERSION)_$(ARCH).deb
 all: gconfig_defs.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@ -895,35 +895,40 @@ uninstall-local:
 	-for try in 1 2 3 4 ; do echo "$(e_pamdir)" "$(e_initdir)" "$(e_sysconfdir)" "$(e_examplesdir)" "$(e_libexecdir)" "$(e_spooldir)" "$(e_docdir)" "$(pkgdatadir)" | tr ' ' '\n' | grep "emailrelay$" | while read d ; do rmdir "$(DESTDIR)/$$d" 2>/dev/null ; done ; done

 RPM_ROOT ?= ${HOME}/rpmbuild
-#RPM_ARCH ?= $(shell arch)
-RPM_ARCH ?= x86_64
+#ARCH ?= $(shell arch)
+ARCH ?= x86_64

 .PHONY: rpm
 rpm: $(RPM)

 $(RPM): dist
-	-rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)
+	-rm -rf $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)-1.$(ARCH)
+	test ! -d $(RPM_ROOT)/BUILD/emailrelay-$(VERSION)-1.$(ARCH)
 	-mkdir -p $(RPM_ROOT)/BUILD $(RPM_ROOT)/SOURCES $(RPM_ROOT)/SPECS 2>/dev/null
 	cp $(TAR) $(RPM_ROOT)/SOURCES/emailrelay-$(VERSION)-src.tar.gz
 	cp $(top_srcdir)/emailrelay.spec $(RPM_ROOT)/SPECS/
-	chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec
-	-rm -f $(RPM) || true
+	-chown root:root $(RPM_ROOT)/SPECS/emailrelay.spec
+	-rm -f $(RPM)
+	test ! -f $(RPM)
 	rpmbuild -ba $(RPM_ROOT)/SPECS/emailrelay.spec
 	test -f $(RPM)

 .PHONY: deb
 deb: $(DEB)

-$(DEB): $(RPM)
+$(DEB): dist
 	-mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$$$ || true
-	alien --to-deb --generate --single --keep-version $(RPM)
-	sed -i 's/^Section:.*/Section: mail/' emailrelay-$(VERSION)/debian/control
-	sed -i 's/^Maintainer:.*/Maintainer: Graeme Walker <graeme_walker@users.sourceforge.net>/' emailrelay-$(VERSION)/debian/control
-	chmod +x $(top_srcdir)/debian/pre* $(top_srcdir)/debian/post*
-	cp $(top_srcdir)/debian/* emailrelay-$(VERSION)/debian/
-	sed -i 's:dh_installchangelogs:dh_installchangelogs ; cp etc/init.d/emailrelay debian/emailrelay.init ; dh_installinit:' emailrelay-$(VERSION)/debian/rules
-	sed -i 's:dh_installdeb:dh_installdeb ; echo /etc/emailrelay.conf > debian/emailrelay/DEBIAN/conffiles:' emailrelay-$(VERSION)/debian/rules
-	cd emailrelay-$(VERSION) && debian/rules binary
+	tar xzf $(TAR)
+	cd emailrelay-$(VERSION) && fakeroot debian/rules binary
+	mkdir emailrelay-$(VERSION)/debian/source
+
+.PHONY: deb-src
+deb-src: dist
+	-mv emailrelay-$(VERSION) emailrelay-$(VERSION).old.$$$$ || true
+	tar xzf $(TAR)
+	mkdir emailrelay-$(VERSION)/debian/source
+	echo 1.0 > emailrelay-$(VERSION)/debian/source/format
+	dpkg-source --build emailrelay-$(VERSION)

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/132
+++ b/132
@ -1,125 +1,15 @@
 News
 ----
-E-MailRelay Version 2.0 is a major release, with more complete support for IPv6
-and TLS, a reworked Windows core, and non-blocking execution of external filters
-and address verifiers.
+E-MailRelay 2.1 removes the backwards-compatibility features that were put in
+to make the migration from 1.9 to 2.0 smoother. Refer to the NEWS file from
+the 2.0 release for the details.

-Compatibility
-------------
-There are some breaks in compatibility with earlier versions, althought most
-have backwards-compatibility mitigations built into the 2.0 code:
-
-# TLS command-line options have changed
-
-  The "--server-tls" options no longer takes a value; the certificate file
-  is given by a separate "--server-tls-certificate" option. A temporary
-  backwards-compatibility fix inserts "--server-tls-certificate" between
-  "--server-tls" and the filename, with a deprecation warning.
-
-  The "--tls-config" options have changed. The certificate-verification
-  tweaks have become command-line options in their own right (such as
-  "--server-tls-verify") and the protocol version options are spelt out
-  as "tlsv1.1" etc. For example, "--tls-config=mbedtls,tlsv1.1,-tlsv1.2".
-
-# Reserved exit codes from filters are handled differently
-
-  The reserved "--filter" exit codes are handled as shown below. The
-  ones that were explicitly documented behave in the same way, although
-  the 'rescan' feature (103) is no longer tied to "--poll".
-
-# The admin command-line has cosmetic changes
-
-  The "--admin" command-line usage is a bit tidier, although the "flush"
-  command is unchanged. Users of the "notify" command should re-test.
-
-# Address verifier command-line is simpler
-
-  The command-line passed to the external address verifier script is
-  simplified. Backwards compatibility is preserved by using a new
-  command-line option "--address-verifier" to replace "--verifier". For
-  forwards compatibility there requirement to supply an interface version
-  number.
-
-# The secrets file format has changed
-
-  See below.
-
-# The message envelope format is updated
-
-  The message envelope file format has changed, with full backwards
-  compatibility. The ClientName fields is removed, and the MailFromAuthIn
-  and MailFromAuthOut fields are added.
-
-Secrets file
------------
-The second field of the secrets file is now the password encoding rather than
-the authentication mechanism. This can be made backwards compatible since in
-earlier releases there was an unambiguous mapping of mechanism to format.
-
-In 2.0 the mechanism is not fixed; the client side protocol will try all of
-the server's mechanisms for which it has compatible secrets, with plaintext
-passwords being compatible with any mechanism.
-
-On the server side the server advertises all mechanisms, regardless of the
-available secrets, since the client is expected to go through the list of
-advertised mechanisms until it gets to one where there is an available server
-secret. This is unlikely to cause a regression since only MD5 passwords can
-result in an authentication mismatch and CRAM-MD5 is the first and most secure
-mechanism advertised; to get a regression failure a CRAM-MD5 capable client
-would see (eg.) LOGIN appear as an additional mechanism, and then perversely
-choose LOGIN in preference to CRAM-MD5, and then give up before trying
-CRAM-MD5.
-
-Filter exit codes
-----------------
-For completeness, this is the filter exit code handling, showing how the
-changes for 2.0 affect documented and undocumented exit codes in the
-range 104 to 107:
-
-Server v1.9:
-* 0 ok (commit of .new)
-* 1..99 fail (rename .bad)
-* 100 abandon (try to commit but ignore errors) (documented)
-* 101 ok
-* 102 abandon, re-scan (by expiring --poll timer)
-* 103 ok, re-scan (documented)
-* 104 abandon
-* 105 ok
-* 106 abandon, re-scan
-* 107 ok, re-scan
-* 108.. fail
-
-Server v2.0:
-* 0 ok (commit of .new)
-* 1..99 fail (rename .bad)
-* 100 abandon (try to commit but ignore errors) (documented)
-* 101 ok
-* 102 abandon, re-scan (independent of --poll)
-* 103 ok, re-scan (documented)
-* 104 fail, re-scan
-* 105.. fail
-
-Client v1.9:
-* 0 ok (send, delete)
-* 1..99 fail (dont send, rename .bad)
-* 100 ignore (dont send, dont delete or rename) (documented)
-* 101 ok
-* 102 ok, stop scanning (documented)
-* 103 ok
-* 104 ignore
-* 105 ok
-* 106 ok, stop scanning
-* 107 ok
-* 108.. fail
-
-Client v2.0:
-* 0 ok (send, delete)
-* 1..99 fail (dont send, rename .bad)
-* 100 ignore (dont send, dont delete or rename) (documented)
-* 101 ok
-* 102 ok, stop scanning (documented)
-* 103 ok
-* 104 ignore, stop scanning
-* 105 fail, stop scanning
-* 105.. fail
+The creation of ".local" files for local-mailbox recipients has changed slightly
+in this release in that normal message files are not created if the message only
+has local-mailbox recipients. This will affect users of the "--address-verifier"
+option where the verifier script returns zero.

+The 2.1 release continues the migration from C++1998 to C++2011. It is still
+possible to use C++1998, but in addition to loosing multithreading you might
+also loose the installation/configuration GUI since Qt has dropped support for
+C++1998.
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.1
+2.1
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1186,7 +1186,7 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR

+m4_include([m4/acinclude.m4])
 m4_include([m4/m4_ax_cxx_compile_stdcxx.m4])
 m4_include([m4/m4_ax_cxx_compile_stdcxx_11.m4])
 m4_include([m4/pkg.m4])
-m4_include([acinclude.m4])
--- a/autogen.sh
+++ b/autogen.sh
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
@ -18,8 +18,10 @@
 example_scripts = \
 	emailrelay-bcc-check.pl \
 	emailrelay-multicast.sh \
-	emailrelay-process.sh \
-	emailrelay-sendmail.pl
+	emailrelay-rot13.pl \
+	emailrelay-sendmail.pl \
+	emailrelay-set-from.js \
+	emailrelay-set-from.pl

 example_scripts_in = \
 	emailrelay-deliver.sh.in \
@ -49,7 +51,6 @@ js_scripts = \
 	emailrelay-resubmit.js \
 	emailrelay-service-install.js

-
 EXTRA_DIST = \
 	$(example_scripts) \
 	$(example_scripts_in) \
@ -72,7 +73,7 @@ e_init_SCRIPTS = \
 CLEANFILES = \
 	$(example_scripts_out)

-do_sed = sed -e "s%__SPOOL_DIR__%${e_spooldir}%g" -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__SYSCONF_DIR__%${e_sysconfdir}%g"
+do_sed = sed -e "s%__SPOOL_DIR__%${e_spooldir}%g" -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__SYSCONF_DIR__%${e_sysconfdir}%g" -e "s%__LIBEXEC_DIR__%${e_libexecdir}%g" -e "s%__RUNDIR__%${e_rundir}%g"

 emailrelay-deliver.sh: emailrelay-deliver.sh.in
 	$(do_sed) < $(srcdir)/emailrelay-deliver.sh.in > emailrelay-deliver.sh
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@ -92,10 +92,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = bin
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -169,6 +169,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -177,15 +178,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -251,6 +250,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
@ -282,8 +282,10 @@ top_srcdir = @top_srcdir@
 example_scripts = \
 	emailrelay-bcc-check.pl \
 	emailrelay-multicast.sh \
-	emailrelay-process.sh \
-	emailrelay-sendmail.pl
+	emailrelay-rot13.pl \
+	emailrelay-sendmail.pl \
+	emailrelay-set-from.js \
+	emailrelay-set-from.pl

 example_scripts_in = \
 	emailrelay-deliver.sh.in \
@ -335,7 +337,7 @@ e_init_SCRIPTS = \
 CLEANFILES = \
 	$(example_scripts_out)

-do_sed = sed -e "s%__SPOOL_DIR__%${e_spooldir}%g" -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__SYSCONF_DIR__%${e_sysconfdir}%g"
+do_sed = sed -e "s%__SPOOL_DIR__%${e_spooldir}%g" -e "s%__SBIN_DIR__%${sbindir}%g" -e "s%__SYSCONF_DIR__%${e_sysconfdir}%g" -e "s%__LIBEXEC_DIR__%${e_libexecdir}%g" -e "s%__RUNDIR__%${e_rundir}%g"
 all: all-am

 .SUFFIXES:
--- a/bin/doxygen.sh
+++ b/bin/doxygen.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -48,6 +48,9 @@ then
 		cat > "${doxyfile_out}"
 	rm -f doxygen.out html/index.html 2>/dev/null
 	cat "${doxyfile_out}" | doxygen - > doxygen.out 2>&1
+	if test ! -f "${subdir}/index.html" ; then
+		echo doxygen.sh: no html output generated by doxygen: check doxygen.out >&2
+	fi
 	test -f "${subdir}/index.html"
 else
 	mkdir "${subdir}" 2>/dev/null
--- a/bin/emailrelay-bcc-check.pl
+++ b/bin/emailrelay-bcc-check.pl
@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -18,20 +18,20 @@
 #
 # emailrelay-bcc-check.pl
 #
-# An example emailrelay filter script that rejects messages
-# that have a non-empty "Bcc:" recipient list unless the "Bcc:"
-# recipient list contains a single addressee that matches
-# envelope recipient.
+# An example E-MailRelay "--filter" script that rejects e-mail messages that
+# have a non-empty "Bcc:" recipient list unless the "Bcc:" recipient list
+# contains a single addressee that matches the envelope recipient. This has
+# the effect of checking that a submitting user agent is behaving correctly
+# as per RFC-5322 3.6.3.
 #
-# Bcc handling is generally only a concern for e-mail user agent
-# programs and not relays and proxies. User agents should
-# normally submit a message separately for each Bcc recipient
-# with either no "Bcc:" field or with the "Bcc:" field
-# containing that one recipient (see RFC-5322).
+# Bcc handling is generally only a concern for e-mail user agent programs
+# and not relays and proxies. User agents should normally submit a message
+# separately for each Bcc recipient with either no "Bcc:" field or with the
+# "Bcc:" field containing that one recipient.
 #
-# Note that correct parsing of content files is beyond the
-# scope of a simple example script like this, and incorrect
-# Bcc handling can have a serious privacy implications.
+# Note that correct parsing of content files is beyond the scope of a simple
+# example script like this, and incorrect Bcc handling can have a serious
+# privacy implications.
 #

 use strict ;
@ -87,7 +87,7 @@ sub read_headers
 		last if ( $line eq "" ) ;
 		my ( $a , $b , $c , $d ) = ( $line =~ m/^(\S*):\s*(.*)|^(\s)(.*)/ ) ;
 		if( $a ) { $h{$a} = $b ; $k = $a }
-		if( $k && $d ) { $h{$k} .= "$c$d" }
+		if( $k && $d ) { $h{$k} .= "$c$d" } # folding
 	}
 	return %h ;
 }
--- a/bin/emailrelay-deliver.sh.in
+++ b/bin/emailrelay-deliver.sh.in
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
--- a/bin/emailrelay-edit-content.js
+++ b/bin/emailrelay-edit-content.js
@ -1,5 +1,5 @@
 //
-// Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+// Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 //
 // 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
@ -64,6 +64,7 @@ try
 catch( e )
 {
 	// report errors using the special <<...>> markers
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
 	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
 	WScript.Quit( 1 ) ;
 }
--- a/bin/emailrelay-edit-envelope.js
+++ b/bin/emailrelay-edit-envelope.js
@ -1,5 +1,5 @@
 //
-// Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+// Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 //
 // 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
@ -32,7 +32,7 @@ try
 {
 	// parse the command-line to get the envelope filename
 	var content = WScript.Arguments(0) ;
-	var envelope = content.substr(0,content.length-7) + "envelope.new" ;
+	var envelope = WScript.Arguments(1) ;

 	// open the envelope file
 	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
@ -73,6 +73,7 @@ try
 catch( e )
 {
 	// report errors using the special <<...>> markers
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
 	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
 	WScript.Quit( 1 ) ;
 }
--- a/bin/emailrelay-multicast.sh
+++ b/bin/emailrelay-multicast.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -18,33 +18,33 @@
 #
 # emailrelay-multicast.sh
 #
-# An example "--filter" script that copies/links each new message into all
-# avaliable sub-directories of the main spool directory. The original message
-# files are deleted if they were successfully copied/linked into all
+# An example E-MailRelay "--filter" script that copies/links each new message
+# into all available sub-directories of the main spool directory. The original
+# message files are deleted if they were successfully copied/linked into all
 # sub-directories.
 #
-# This can be used for doing SMTP multicast by having an emailrelay forwarding
+# This can be used for SMTP multicast by having an emailrelay forwarding
 # process polling each sub-directory. (For POP multicasting use the
 # "emailrelay-filter-copy" program with the "pop-by-name" feature so that
 # there is no need to copy or link content files.)
 #
-# Hard links are used for the content files in order to conserve disk space. Log
-# entries are written into the base envelope file to help with error recovery.
+# Hard links are used for the content files in order to conserve disk space.
+# Log entries are written into the base envelope file to help with error
+# recovery.
 #
-# The remote SMTP client which is submitting the message will be notified of any
-# failures in this script via SMTP error responses. Alternatively an "exit 0"
-# can be used to silently leave the message in the main spool directory (see
-# below).
+# By default errors in running this script are fed back to the remote SMTP
+# client. Alternatively, edit the code below to ignore these errors and leave
+# the submitted e-mail message in the main spool directory.
 #

 # parse the command-line
 #
 content="$1"
-envelope="`echo \"${content}\" | sed 's/content$/envelope.new/'`"
+envelope="$2"
 base_dir="`dirname \"${content}\"`"
-if test "$1" = "" -o "${content}" = "${envelope}" -o "${base_dir}" = "."
+if test "$1" = "" -o "${base_dir}" = "."
 then
-	echo usage: `basename $0` '<content-file>' >&2
+	echo usage: `basename $0` '<content-file> <envelope-file>' >&2
 	exit 2
 fi

@ -82,8 +82,9 @@ then
 	rm -f "${content}" "${envelope}"
 	exit 100
 else
-	# something failed -- tell the submitting smtp client
-	# replace these two lines with "exit 0" if the client should not know...
+	# something failed -- tell the submitting smtp client, or
+	# replace these three lines with "exit 0" if the client should not know...
+	echo "<<multicast failed>>"
 	echo "<<`basename $0`: `basename "${content}"`: failed to copy message into${error_list}>>"
 	exit 1
 fi
--- a/bin/emailrelay-notify.sh.in
+++ b/bin/emailrelay-notify.sh.in
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -29,7 +29,8 @@
 #
 #   if test -f /var/spool/emailrelay/*.envelope.bad ; then echo Failed mail >&2 ; fi
 #
-# or perhaps a cron entry like this (since output from a cron job gets sent as mail):
+# or perhaps a cron entry like this, since output from a cron job gets sent
+# as mail:
 #
 #   0 0 * * * /bin/cat /var/spool/emailrelay/*.envelope.bad 2>/dev/null
 #
--- a/bin/emailrelay-process.sh
+++ b/bin/emailrelay-process.sh
@ -1,148 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# 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, see <http://www.gnu.org/licenses/>.
-# ===
-#
-# emailrelay-process.sh
-#
-# An example "--filter" script for the E-MailRelay SMTP server which does
-# rot-13 masking.
-#
-
-awk="awk"
-tmp="/tmp/`basename $0`.$$.tmp"
-log="/tmp/`basename $0`.out"
-trap "rm -f \"${tmp}\" >/dev/null 2>&1 ; exit" 0 1 2 3 13 15
-
-###
-# ProcessContent()
-# Processes the content part of an RFC822 message. This
-# implementation does rot13 masking.
-#
-ProcessContent()
-{
-	"${awk}" '
-	BEGIN {
-		map_upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-		map_lower = tolower(map_upper)
-		in_header = 1
-	}
-
-	function rot( n , c , map )
-	{
-		return index(map,c) ? substr(map,((index(map,c)+n-1)%length(map))+1,1) : c
-	}
-
-	function rot_c( n , c )
-	{
-		return rot(n,rot(n,c,map_upper),map_lower)
-	}
-
-	function rot_s( n , string )
-	{
-		rot_s_result = ""
-		for( i = 1 ; i <= length(string) ; i++ )
-			rot_s_result = rot_s_result rot_c(n,substr(string,i,1))
-		return rot_s_result
-	}
-
-	{
-		is_blank = match($0,"^[[:space:]]*$")
-		if( in_header && is_blank )
-			in_header = 0
-
-		if( in_header )
-			print
-		else
-			print rot_s(13,$0)
-	}
-	'
-}
-
-###
-# Wrap()
-# Processes an RCF822 message so that the original content
-# appears as an attachment.
-#
-Wrap()
-{
-	"${awk}" -v boundary="-----`basename $0`.$$" -v message="$@" '
-	BEGIN {
-		in_header = 1
-		n = 1
-	}
-	{
-		is_blank = match($0,"^[[:space:]]*$")
-		if( in_header && is_blank )
-		{
-			printf( "Content-Type: multipart/mixed; boundary=\"%s\"\r\n" , boundary )
-			printf( "\r\n" )
-			printf( "\r\n" )
-			printf( "--%s\r\n" , boundary )
-			printf( "Content-Type: text/plain; charset=us-ascii\r\n" )
-			printf( "\r\n" )
-			printf( "%s\r\n" , message )
-			printf( "\r\n" )
-			printf( "--%s\r\n" , boundary )
-			printf( "Content-Type: message/rfc822\r\n" )
-			printf( "Content-Transfer-Encoding: 8bit\r\n" )
-			printf( "Content-Description: encrypted message\r\n" )
-			printf( "\r\n" )
-			for( i = 1 ; i < n ; i++ )
-				print header[i]
-		}
-
-		if( in_header && is_blank )
-			in_header = 0
-
-		if( in_header )
-		{
-			header[n++] = $0
-
-			is_mime_content = match($0,"^Content-")
-			is_continuation = match($0,"^[[:space:]][[:space:]]*[^[:space:]]")
-			suppress = is_mime_content || (was_mime_content && is_continuation)
-			was_mime_content = suppress
-
-			if( ! suppress )
-				print
-		}
-		else
-		{
-			print
-		}
-	}
-	END {
-		printf( "--%s--\r\n" , boundary )
-		printf( "\r\n" )
-	}
-	'
-}
-
-Main()
-{
-	cat "${1}" | ProcessContent | Wrap "The original message has been encrypted..." > "${tmp}"
-	cp "${tmp}" "${1}"
-}
-
-debug="0"
-if test "${debug}" -eq 1
-then
-	Main "$@" > "${log}" 2>&1
-else
-	Main "$@"
-fi
-
--- a/bin/emailrelay-resubmit.js
+++ b/bin/emailrelay-resubmit.js
@ -1,5 +1,5 @@
 //
-// Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+// Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 //
 // 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
--- a/bin/emailrelay-resubmit.sh.in
+++ b/bin/emailrelay-resubmit.sh.in
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
--- a/bin/emailrelay-rot13.pl
+++ b/bin/emailrelay-rot13.pl
@ -0,0 +1,93 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# emailrelay-rot13.pl
+#
+# An example E-MailRelay "--filter" script that does rot-13 masking.
+#
+
+use strict ;
+use FileHandle ;
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
+
+my $content = $ARGV[0] ;
+my $content_tmp = "$content.tmp" ;
+my $fh_in = new FileHandle( $content , "r" ) or die "cannot open content file [$content]: $!\n" ;
+my $fh_out = new FileHandle( "$content_tmp" , "w" ) or die "cannot open temporary file [$content_tmp]: $!\n" ;
+my $boundary = "-----emailrelay-rot13-$$" ;
+my $in_header = 1 ;
+my @headers = () ;
+while(<$fh_in>)
+{
+	chomp( my $line = $_ ) ;
+	$line =~ s/\r$// ;
+
+	if( $in_header && ( $line =~ m/^\s/ ) && scalar(@headers) ) # folding
+	{
+		@headers[-1] .= "\r\n$line" ;
+	}
+	elsif( $in_header && ( $line =~ m/^$/ ) )
+	{
+		$in_header = 0 ;
+		for my $h ( @headers )
+		{
+			if( $h =~ m/^(subject|to|from):/i )
+			{
+				print $fh_out $h , "\r\n" ;
+			}
+		}
+		print $fh_out "Content-Type: multipart/mixed; boundary=\"$boundary\"\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "--$boundary\r\n" ;
+		print $fh_out "Content-Type: text/plain; charset=us-ascii\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "The original message has been masked...\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out "--$boundary\r\n" ;
+		print $fh_out "Content-Type: text/plain\r\n" ;
+		print $fh_out "Content-Transfer-Encoding: 8bit\r\n" ;
+		print $fh_out "Content-Description: masked message\r\n" ;
+		print $fh_out "\r\n" ;
+		print $fh_out join( "\r\n" , map { rot13($_) } (@headers,"") ) ;
+	}
+	elsif( $in_header )
+	{
+		push @headers , $line ;
+	}
+	else
+	{
+		print $fh_out rot13($line) , "\r\n" ;
+	}
+}
+print $fh_out "--$boundary--\r\n" ;
+print $fh_out "\r\n" ;
+
+$fh_in->close() or die ;
+$fh_out->close() or die "cannot write new file [$content_tmp]: $!\n" ;
+unlink( $content ) or die "cannot delete original file [$content]: $!\n" ;
+rename( $content_tmp , $content ) or die "cannot rename [$content_tmp]: $!\n" ;
+exit( 0 ) ;
+
+sub rot13
+{
+	my ( $s ) = @_ ;
+	$s =~ tr/[a-m][n-z][A-M][N-Z]/[n-z][a-m][N-Z][A-M]/ ;
+	return $s ;
+}
+
--- a/bin/emailrelay-sendmail.pl
+++ b/bin/emailrelay-sendmail.pl
@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -18,11 +18,11 @@
 #
 # emailrelay-sendmail.pl
 #
-# A sendmail/emailrelay shim. Typically installed as /usr/sbin/sendmail or /usr/lib/sendmail.
+# A sendmail/emailrelay shim. Typically installed as /usr/sbin/sendmail or
+# /usr/lib/sendmail.
 #
 use strict ;
 use Getopt::Std ;
-use FileHandle ;

 my $usage = "usage: emailrelay-sendmail [-intUv] [-BbCdFhNOopqRrVX <arg>] [-f <from>]" ;
 my %opt = () ;
--- a/bin/emailrelay-service-install.js
+++ b/bin/emailrelay-service-install.js
@ -1,5 +1,5 @@
 //
-// Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+// Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 //
 // 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
@ -17,7 +17,8 @@
 //
 // emailrelay-service-install.js
 //
-// Runs "emailrelay-service --install" and then opens the service control panel.
+// Runs "emailrelay-service --install" and then opens the Windows service
+// control panel.
 //

 try
--- a/bin/emailrelay-set-from.js
+++ b/bin/emailrelay-set-from.js
@ -0,0 +1,99 @@
+//
+// Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
+//
+// 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// 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, see <http://www.gnu.org/licenses/>.
+// ===
+//
+// emailrelay-set-from.js
+//
+// An example "--filter" script that edits the content originator fields
+// (ie. From, Sender and Reply-To) to a fixed value.
+//
+// See also: RFC-2822
+//
+try
+{
+	var new_from = 'noreply@example.com' ;
+	var new_sender = '' ;
+	var new_reply_to = new_from ;
+
+	var content = WScript.Arguments( 0 ) ;
+	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
+	var in_ = fs.OpenTextFile( content , 1 , false ) ;
+	var out_ = fs.OpenTextFile( content + ".tmp" , 8 , true ) ;
+
+	var re_from = /^From:/i ;
+	var re_sender = /^Sender:/i ;
+	var re_reply_to = /^Reply-To:/i ;
+	var re_fold = /^[ \t]/ ;
+
+	var in_edit = 0 ;
+	while( !in_.AtEndOfStream )
+	{
+		var line = in_.ReadLine() ;
+		if( line === "" )
+		{
+			out_.WriteLine( line ) ;
+			break ;
+		}
+
+		if( line.match(re_from) && new_from !== null )
+		{
+			in_edit = 1 ;
+			line = "From: " + new_from ;
+			out_.WriteLine( line ) ;
+		}
+		else if( line.match(re_sender) && new_sender !== null )
+		{
+			in_edit = 1 ;
+			line = "Sender: " + new_sender ;
+			if( new_sender !== "" )
+			{
+				out_.WriteLine( line ) ;
+			}
+		}
+		else if( line.match(re_reply_to) && new_reply_to !== null )
+		{
+			in_edit = 1 ;
+			line = "Reply-To: " + new_reply_to ;
+			out_.WriteLine( line ) ;
+		}
+		else if( in_edit && line.match(re_fold) )
+		{
+		}
+		else
+		{
+			in_edit = 0 ;
+			out_.WriteLine( line ) ;
+		}
+	}
+	while( !in_.AtEndOfStream )
+	{
+		var body_line = in_.ReadLine() ;
+		out_.WriteLine( body_line ) ;
+	}
+
+	in_.Close() ;
+	out_.Close() ;
+	fs.DeleteFile( content ) ;
+	fs.MoveFile( content + ".tmp" , content ) ;
+
+	WScript.Quit( 0 ) ;
+}
+catch
+{
+	WScript.StdOut.WriteLine( "<<edit failed>>" ) ;
+	WScript.StdOut.WriteLine( "<<" + e + ">>" ) ;
+	WScript.Quit( 1 ) ;
+}
--- a/bin/emailrelay-set-from.pl
+++ b/bin/emailrelay-set-from.pl
@ -0,0 +1,89 @@
+#!/usr/bin/env perl
+#
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# emailrelay-set-from.pl
+#
+# An example E-MailRelay "--filter" script that edits the content originator
+# fields (ie. From, Sender and Reply-To) to a fixed value.
+#
+# See also: RFC-2822
+#
+
+use strict ;
+use FileHandle ;
+$SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
+
+# originator fields (RFC-2822 3.6.2)
+my $new_from = 'noreply@example.com' ;
+my $new_sender = '' ;
+my $new_reply_to = $new_from ;
+
+my $content = @ARGV[0] or die "usage error\n" ;
+
+my $in = new FileHandle( $content , "r" ) or die ;
+my $out = new FileHandle( "$content.tmp" , "w" ) or die ;
+my $in_body = undef ;
+my $in_edit = undef ;
+while(<$in>)
+{
+	if( $in_body )
+	{
+		print $out $_ ;
+	}
+	else
+	{
+		chomp( my $line = $_ ) ;
+		$line =~ s/\r$// ;
+
+		$in_body = 1 if ( $line eq "" ) ;
+		my $is_from = ( $line =~ m/^From:/i ) ;
+		my $is_sender = ( $line =~ m/^Sender:/i ) ;
+		my $is_reply_to = ( $line =~ m/^Reply-To:/i ) ;
+
+		if( $in_body )
+		{
+			print $out "\r\n" ;
+		}
+		elsif( $is_from && defined($new_from) )
+		{
+			$in_edit = 1 ;
+			print $out "From: $new_from\r\n" ;
+		}
+		elsif( $is_sender && defined($new_sender) )
+		{
+			$in_edit = 1 ;
+			print $out "Sender: $new_sender\r\n" unless $new_sender eq "" ;
+		}
+		elsif( $is_reply_to && defined($new_reply_to) )
+		{
+			$in_edit = 1 ;
+			print $out "Reply-To: $new_reply_to\r\n" ;
+		}
+		elsif( $in_edit && $line =~ m/^[ \t]/ ) # original header was folded
+		{
+		}
+		else
+		{
+			$in_edit = undef ;
+			print $out $line , "\r\n" ;
+		}
+	}
+}
+$out->close() or die ;
+rename( "$content.tmp" , $content ) or die ;
+exit 0 ;
--- a/bin/emailrelay-submit.sh.in
+++ b/bin/emailrelay-submit.sh.in
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -18,17 +18,16 @@
 #
 # emailrelay-submit.sh
 #
-# An example script that deposits e-mail messages into sub-directories
-# of the main E-MailRelay spool directory depending on the "To:"
-# address. This could be used with an E-MailRelay POP server running
-# with the "pop-by-name" option so that messages get routed appropriately.
+# An example script that reads an e-mail message from stdin and deposits in into
+# a sub-directory of the E-MailRelay spool directory depending on the "To:"
+# address. This could be used with an E-MailRelay POP server using the
+# "--pop-by-name" option so that messages get routed appropriately.
 #
-# usage: emailrelay-submit.sh
+# See also 'man emailrelay-filter-copy'.
 #

 store="__SPOOL_DIR__"
 log="/var/log/emailrelay-submit.out"
-awk="awk" # nawk

 tmp="/tmp/`basename $0.$$.tmp`"
 trap "rm -f \"${tmp}\" 2>/dev/null ; exit 0" 0
@ -36,7 +35,7 @@ trap "rm -f \"${tmp}\" 2>/dev/null ; exit 1" 1 2 3 13 15

 List()
 {
-	# Maps from the given "To:" address to a spool subdirectory -- edit as required
+	# Maps from the given "To:" address to a spool sub-directory -- edit as required
 	to_="${1}"
 	to_="`echo \"${to_}\" | tr '[A-Z]' '[a-z]'`"
 	case "${to_}" in
@ -48,7 +47,7 @@ List()

 Create()
 {
-	# Creates a spool subdirectory if it doesnt already exist
+	# Creates a spool sub-directory if it doesnt already exist
 	dir_="${1}"
 	if test ! -f "${dir_}"
 	then
@ -65,7 +64,7 @@ Main()
 	cat > ${tmp}

 	# parse out the "To:" address
-	to="`head -500 \"${tmp}\" | grep '^To:' | ${awk} '{print $2}'`"
+	to="`head -500 \"${tmp}\" | grep '^To:' | perl -ane 'print $F[1];exit'`"
 	echo `basename $0`: to \"${to}\"

 	# submit the message into the main spool directory
@ -78,7 +77,7 @@ Main()
 		return
 	fi

-	# link & copy into subdirectories
+	# link & copy into sub-directories
 	copied="0"
 	for name in `List "${to}"` ""
 	do
--- a/bin/emailrelay.sh.in
+++ b/bin/emailrelay.sh.in
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -18,7 +18,7 @@
 #
 # emailrelay
 #
-# A shell-script wrapper for E-MailRelay for use in the SysV-init system.
+# A start/stop script for E-MailRelay in the SysV init system.
 #
 # usage: emailrelay { start | stop | restart | force-reload | status }
 #
@ -30,34 +30,39 @@
 # Required-Stop:       $local_fs $network $syslog
 # Default-Start:       2 3 4 5
 # Default-Stop:        0 1 6
-# Short-Description:   E-MailRelay store-and-forward MTA.
+# Short-Description:   E-MailRelay mail server
 ### END INIT INFO
 ##

 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 NAME=emailrelay
-DESC=$NAME
-CONFIG=__SYSCONF_DIR__/emailrelay.conf
-RUNDIR=/var/run/$NAME
-PIDFILE=$RUNDIR/$NAME.pid
+DESC="E-MailRelay mail server"
+CONFIG=__SYSCONF_DIR__/$NAME.conf
+PIDFILE=__RUNDIR__/$NAME.pid
 GROUP=daemon
 DAEMON=__SBIN_DIR__/$NAME
 SUBMIT=__SBIN_DIR__/$NAME-submit

-test -f /etc/default/$NAME && . /etc/default/$NAME
+test -f __SYSCONF_DIR__/default/$NAME && . __SYSCONF_DIR__/default/$NAME
 test -f /etc/rc.conf.d/$NAME && . /etc/rc.conf.d/$NAME
 test -f /etc/default/rcS && . /etc/default/rcS

-log_success_msg() {
+# Default lsb functions in case there is no lsb/init-functions...
+#
+log_success_msg()
+{
 	echo "$@"
 }
-log_failure_msg() {
+log_failure_msg()
+{
 	echo "$@"
 }
-log_warning_msg() {
+log_warning_msg()
+{
 	echo "$@"
 }
-start_daemon() {
+start_daemon()
+{
 	if test "`cat \"$2\" 2>/dev/null`" -gt 0 2>/dev/null && kill -0 "`cat \"$2\"`"
 	then
 		: # running already
@ -66,24 +71,47 @@ start_daemon() {
 		"$@"
 	fi
 }
-killproc() {
+killproc()
+{
 	shift
 	kill `cat "$1" 2>/dev/null` 2>/dev/null
 }
-pidofproc() {
+pidofproc()
+{
 	shift
 	kill -0 `cat "$1" 2>/dev/null` 2>/dev/null
 }
-log_daemon_msg() {
-	log_success_msg "$@"
+log_daemon_msg()
+{
+	echo -n "$@"
 }
-log_progress_msg() {
+log_progress_msg()
+{
 	:;
 }
-log_end_msg() {
-	if test "$1" -eq 0 ; then log_success_msg "...ok" ; else log_failure_msg "...failed!" ; fi
+log_end_msg()
+{
+	if test "$1" -eq 0
+	then
+		log_success_msg " ... ok"
+		true
+	else
+		log_failure_msg " ... failed!"
+		false
+	fi
 }

+# Setup functions...
+#
+# Some packaging scripts do "emailrelay setup" for some of their
+# post-install steps, and "emailrelay setup" might also be useful
+# administratively after editing the /etc/default file. The "start"
+# sub-command below also uses setup_rundir() because the /run
+# directory will not necessarily persist across a reboot.
+#
+# (This code must come before the potential 'init-functions' redirect
+# to systemd.)
+#
 setup_config()
 {
 	if test ! -f "$CONFIG" -a -f "$CONFIG.template"
@ -91,44 +119,95 @@ setup_config()
 		cp -p "$CONFIG.template" "$CONFIG"
 	fi
 }
-
-setup_rundir()
+root_root()
 {
-	if test ! -d "$1"
-	then
-		mkdir -p "$1" && chgrp "$GROUP" "$1" && chmod 770 "$1"
-	fi
+	# True if the given file exists and is owned by 'root.root',
+	# as if newly copied by the install process and never
+	# subsequently chown'ed by the administrator
+	ls -nd "$1" 2>/dev/null | cut -d' ' --fields=3,4 | grep -q '^0 0$'
 }
-
 spooldir()
 {
-	cat "$CONFIG" | tr '\t' ' ' | sed 's/  */ /g' | grep '^spool-dir [^ ]' | tail -1 | cut -d' ' -f 2
+	# Prints the spool directory path from the config file, but with a
+	# default because packaged installs may not edit the config file
+	# like 'make install' does
+	( echo spool-dir /var/spool/emailrelay ; cat "$CONFIG" ) | \
+		tr '\t' ' ' | sed 's/  */ /g' | grep '^spool-dir [^ ]' | \
+		tail -1 | cut -d' ' -f 2
 }
-
-setup_spooldir()
+setup_rundir_imp()
 {
-	if test "$1" != ""
+	test -d "$1" || mkdir -p "$1"
+	if echo "$1" | grep -q "/emailrelay$"
 	then
-		if test ! -d "$1"
+		if root_root "$1"
 		then
-			mkdir -p "$1" && chgrp "$GROUP" "$1" && chmod 775 "$1" && chmod g+s "$1"
+			chgrp "$GROUP" "$1"
+			chmod 775 "$1"
 		fi
 	fi
 }
-
-# do some setup steps -- these should have been done by
-# make-install or by the packaging scripts, but the /etc/default
-# file could have been changed or something -- do this before
-# the potential init-functions redirect to systemd
-if test "$1" = "start"
-then
+setup_rundir()
+{
+	# Recreates the pidfile directory, which might disappear after a reboot
+	setup_rundir_imp "`dirname \"$PIDFILE\"`"
+}
+setup_spooldir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 775 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_spooldir()
+{
+	setup_spooldir_imp "`spooldir`"
+}
+setup_sgid()
+{
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 755 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_tools()
+{
+	setup_sgid "__SBIN_DIR__/emailrelay-submit"
+	setup_sgid "__LIBEXEC_DIR__/emailrelay-filter-copy"
+}
+setup()
+{
 	setup_config
-	setup_rundir "`dirname \"$PIDFILE\"`" 2>/dev/null
-	setup_spooldir "`spooldir`" 2>/dev/null
-fi
+	setup_rundir
+	setup_spooldir
+	setup_tools
+}
+if test "$1" = "setup" ; then setup ; exit 0 ; fi

+# Read lsb init-functions. Annoyingly, systemd sometimes hijacks this to
+# generate a service file under /run/systemd, run systemctl etc, without
+# ever returning to this script.
+#
 test -f /lib/lsb/init-functions && . /lib/lsb/init-functions

+# Ignore /etc/default 'enabled' switch if running from systemd.
+#
+# (The 'enabled' mechanism is needed on non-systemd debian distros
+# because the dpkg postinstall script starts the server, whereas
+# on systemd systems the dpkg postinstall script's call to update-rc.d
+# does nothing. On rpm or 'make install' systems the /etc/default file
+# is not installed at all.)
+#
+if test -d /run/systemd/system -a "$PPID" -eq 1
+then
+	EMAILRELAY_ENABLED="1"
+fi
+
 case "$1" in

 	restart|force-reload)
@ -136,11 +215,25 @@ case "$1" in
 		$0 start
 	;;

+	try-restart)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
 	*start)
-		log_daemon_msg "Starting $DESC"
-		log_progress_msg "$NAME"
-		start_daemon -p "$PIDFILE" -- "$DAEMON" --syslog --pid-file "$PIDFILE" "$CONFIG"
-		log_end_msg $?
+		if test "${EMAILRELAY_ENABLED:-1}" -eq 1
+		then
+			log_daemon_msg "Starting $DESC"
+			log_progress_msg "$NAME"
+			setup_rundir
+			start_daemon -p "$PIDFILE" -- "$DAEMON" --as-server --syslog --pid-file "$PIDFILE" "$CONFIG"
+			e="$?"
+			log_end_msg $e
+			test "$e" -eq 0
+		else
+			log_warning_msg "$NAME startup is disabled in __SYSCONF_DIR__/default/$NAME"
+			exit 0
+		fi
 		;;

 	stop)
@ -150,7 +243,7 @@ case "$1" in
 		log_end_msg $?
 		;;

-	try-restart|reload|force-reload)
+	reload)
 		echo `basename $0`: $1 not implemented >&2
 		exit 3
 		;;
@ -167,16 +260,8 @@ case "$1" in
 		;;

 	setup)
-		setup_rundir "`dirname \"$PIDFILE\"`"
-		setup_spooldir "`spooldir`"
-
-		chmod 550 "$DAEMON"
-		chgrp "$GROUP" "$DAEMON"
-		chmod g+s "$DAEMON"
-
-		chmod 555 "$SUBMIT"
-		chgrp "$GROUP" "$SUBMIT"
-		chmod g+s "$SUBMIT"
+		# never gets here -- see above
+		setup
 		;;

 	*)
--- a/bin/make-manifest.sh
+++ b/bin/make-manifest.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
--- a/bin/make-setup.sh
+++ b/bin/make-setup.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -50,15 +50,19 @@ fi
 echo `basename $0`: running make install into $payload
 payload_path="`cd $payload && pwd`"
 ( cd ../.. && make install GCONFIG_HAVE_DOXYGEN=no DESTDIR=$payload_path ) > /dev/null 2>&1
-rm -rf $payload/usr/share/doc/emailrelay/doxygen

-# check the "./configure" was done by "bin/configure-fhs.sh" (even on a mac)
+# check the "./configure" was done by "bin/configure.sh" for FHS compliance
 if test ! -d "$payload/usr/lib/emailrelay"
 then
 	echo `basename $0`: cannot see expected directories: configure with \"configure.sh\" >&2
 	exit 1
 fi

+# clean up the "make install" output
+rm -f $payload/etc/emailrelay.conf.makeinstall 2>/dev/null
+rm -f $payload/usr/sbin/emailrelay-gui
+rm -rf $payload/usr/share/doc/emailrelay/doxygen
+
 # add the icon
 cp "$icon" $payload/usr/lib/emailrelay/ 2>/dev/null

@ -67,7 +71,7 @@ cat <<EOF >$payload/payload.cfg
 etc/emailrelay.conf=%dir-config%/emailrelay.conf
 etc/emailrelay.conf.template=%dir-config%/emailrelay.conf.template
 etc/emailrelay.auth.template=%dir-config%/emailrelay.auth.template
-etc/init.d/emailrelay=%dir-install%/lib/emailrelay/emailrelay-startstop.sh
+etc/init.d/emailrelay=%dir-config%/init.d/emailrelay
 usr/lib/=%dir-install%/lib/
 usr/share/=%dir-install%/share/
 usr/sbin/=%dir-install%/sbin/
--- a/0
+++ b/0
--- a/bsd/Makefile.am
+++ b/bsd/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
--- a/bsd/Makefile.in
+++ b/bsd/Makefile.in
@ -91,10 +91,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = bsd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -166,6 +166,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -174,15 +175,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -248,6 +247,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
--- a/bsd/emailrelay-bsd.sh.in
+++ b/bsd/emailrelay-bsd.sh.in
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -26,10 +26,10 @@
 #    emailrelay_enable="YES"
 #
 # Delegates to the linux start/stop script, which reads default directories
-# etc. from "/etc/rc.conf.d/emailrelay" and the server command-line options
-# from "/usr/local/etc/emailrelay.conf".
+# from "/etc/rc.conf.d/emailrelay" (if present) and server command-line
+# options from "/usr/local/etc/emailrelay.conf".
 #
-# See also man rc(8).
+# See also man rc(8), man service(8)
 #
 # PROVIDE: emailrelay
 # REQUIRE: DAEMON
--- a/2324
+++ b/2324
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-dnl Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+dnl Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@ -14,191 +14,107 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl ===
 dnl
+dnl configure.ac
+dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl

-AC_INIT([E-MailRelay],[2.0.1],[],[emailrelay])
-AC_CONFIG_SRCDIR([src/gsmtp/gsmtp.h])
+AC_INIT([E-MailRelay],[2.1],[],[emailrelay])
+AC_CONFIG_SRCDIR([src/glib/gdef.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([no-define])
 AC_CONFIG_HEADERS([gconfig_defs.h])
 AM_MAINTAINER_MODE
 AC_DISABLE_OPTION_CHECKING

-dnl ===
-dnl check for programs...
+dnl check for programs
 dnl
 AC_PROG_CC([cc gcc clang])
 AC_PROG_CXX([c++ g++ clang++])
 AX_CXX_COMPILE_STDCXX_11([],[optional])
-AC_PROG_RANLIB
 AC_PROG_INSTALL
-AC_PROG_AWK
+AC_PROG_RANLIB
 AC_PROG_SED
 AC_PROG_GREP
-AC_CHECK_PROGS(MAKE,make gmake)
-AC_CHECK_PROGS(AR,ar gar)
-AC_CHECK_PROGS(GZIP,gzip)
-AC_CHECK_PROG(GCONFIG_HAVE_DOXYGEN,doxygen,yes)
-AC_CHECK_PROG(GCONFIG_HAVE_MAN2HTML,man2html,yes)
+AC_CHECK_PROGS([MAKE],[make gmake])
+AC_CHECK_PROGS([AR],[ar gar])
+AC_CHECK_PROGS([GZIP],[gzip])
+AC_CHECK_PROG([GCONFIG_HAVE_DOXYGEN],[doxygen],[yes])
+AC_CHECK_PROG([GCONFIG_HAVE_MAN2HTML],[man2html],[yes])
 GCONFIG_FN_PROG_WINDRES
 GCONFIG_FN_PROG_WINDMC
-GCONFIG_FN_CONFIGURATION

-dnl ===
-dnl check for libraries...
+dnl check for system libraries
 dnl
 AC_LANG([C])
-GCONFIG_FN_SEARCHLIBS_POSIX
+GCONFIG_FN_SEARCHLIBS_NAMESERVICE
+GCONFIG_FN_SEARCHLIBS_SOCKET

-dnl ===
-dnl check for header files, functions and typedefs...
+dnl check for header files, functions, types etc.
 dnl
 AC_LANG([C++])
-GCONFIG_FN_TYPE_SOCKLEN_T
-GCONFIG_FN_TYPE_ERRNO_T
-GCONFIG_FN_TYPE_SSIZE_T
-GCONFIG_FN_CXX_NULLPTR
-GCONFIG_FN_CXX_CONSTEXPR
-GCONFIG_FN_CXX_NOEXCEPT
-GCONFIG_FN_CXX_OVERRIDE
-GCONFIG_FN_CXX_FINAL
-GCONFIG_FN_CXX_TYPE_TRAITS
-GCONFIG_FN_CXX_EMPLACE
-GCONFIG_FN_CXX_ALIGNMENT
-GCONFIG_FN_CXX_SHARED_PTR
-GCONFIG_FN_CXX_STD_THREAD
-GCONFIG_FN_CXX_STD_WSTRING
-GCONFIG_FN_IPV6
-GCONFIG_FN_SIN6_LEN
-GCONFIG_FN_STATBUF_NSEC
-GCONFIG_FN_INET_NTOP
-GCONFIG_FN_INET_PTON
-GCONFIG_FN_GETPWNAM
-GCONFIG_FN_GETPWNAM_R
-GCONFIG_FN_GMTIME_R
-GCONFIG_FN_GMTIME_S
-GCONFIG_FN_LOCALTIME_R
-GCONFIG_FN_LOCALTIME_S
-GCONFIG_FN_STRNCPY_S
-GCONFIG_FN_SETPGRP_BSD
-GCONFIG_FN_SETGROUPS
-GCONFIG_FN_GETENV_S
-GCONFIG_FN_READLINK
-GCONFIG_FN_ICONV
-GCONFIG_FN_PROC_PIDPATH
+GCONFIG_FN_CHECK_HEADERS
+GCONFIG_FN_CHECK_TYPES
+GCONFIG_FN_CHECK_CXX
+GCONFIG_FN_CHECK_NET
+GCONFIG_FN_CHECK_FUNCTIONS
+
+dnl check for packages
+dnl
 GCONFIG_FN_QT
 GCONFIG_FN_TLS_OPENSSL
 GCONFIG_FN_TLS_MBEDTLS

-dnl ===
 dnl initialise aclocal/pkg.m4...
 dnl
 # if the configure script fails in this area then you are probably missing pkg.m4
-PKG_PROG_PKG_CONFIG(0.9.0)
+PKG_PROG_PKG_CONFIG([0.9.0])

-dnl ===
-dnl "--enable-std-thread"
+dnl "--enable-whatever"
 dnl
-AC_ARG_ENABLE(std-thread,AS_HELP_STRING([--enable-std-thread],[use std::thread or not (default auto)]))
+AC_ARG_ENABLE([std-thread],AS_HELP_STRING([--enable-std-thread],[use std::thread or not (default auto)]))
 GCONFIG_FN_ENABLE_STD_THREAD
-
-dnl ===
-dnl "--enable-debug"
-dnl
-AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[enable extra debug messages at compile-time (default no)]))
+AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[enable extra debug messages at compile-time (default no)]))
 GCONFIG_FN_ENABLE_DEBUG
-
-dnl ===
-dnl "--enable-ipv6"
-dnl
-AC_ARG_ENABLE(ipv6,AS_HELP_STRING([--enable-ipv6],[enable ipv6 (default auto)]))
+AC_ARG_ENABLE([ipv6],AS_HELP_STRING([--enable-ipv6],[enable ipv6 (default auto)]))
 GCONFIG_FN_ENABLE_IPV6
-
-dnl ===
-dnl "--enable-gui"
-dnl
-AC_ARG_ENABLE(gui,AS_HELP_STRING([--enable-gui],[enable configuration gui (requires Qt) (default auto)]))
+AC_ARG_ENABLE([gui],AS_HELP_STRING([--enable-gui],[enable configuration gui (requires Qt) (default auto)]))
 GCONFIG_FN_ENABLE_GUI
-
-dnl ===
-dnl "--enable-verbose"
-dnl
-AC_ARG_ENABLE(verbose,AS_HELP_STRING([--enable-verbose],[enable verbose logging (default yes)]))
+AC_ARG_ENABLE([verbose],AS_HELP_STRING([--enable-verbose],[enable verbose logging (default yes)]))
 GCONFIG_FN_ENABLE_VERBOSE
-
-dnl ===
-dnl "--enable-bsd"
-dnl
-AC_ARG_ENABLE(bsd,AS_HELP_STRING([--enable-bsd],[enable building for bsd (default auto)]))
+AC_ARG_ENABLE([bsd],AS_HELP_STRING([--enable-bsd],[enable building for bsd (default auto)]))
 GCONFIG_FN_ENABLE_BSD
-
-dnl ===
-dnl "--enable-mac"
-dnl
-AC_ARG_ENABLE(mac,AS_HELP_STRING([--enable-mac],[enable building for mac os x (default auto)]))
+AC_ARG_ENABLE([mac],AS_HELP_STRING([--enable-mac],[enable building for mac os x (default auto)]))
 GCONFIG_FN_ENABLE_MAC
-
-dnl ===
-dnl "--enable-windows"
-dnl
-AC_ARG_ENABLE(windows,AS_HELP_STRING([--enable-windows],[enable building for windows (default auto)]))
+AC_ARG_ENABLE([windows],AS_HELP_STRING([--enable-windows],[enable building for windows (default auto)]))
 GCONFIG_FN_ENABLE_WINDOWS
-
-dnl ===
-dnl "--enable-testing"
-dnl
-AC_ARG_ENABLE(testing,AS_HELP_STRING([--enable-testing],[enable make check tests (default yes)]))
+AC_ARG_ENABLE([testing],AS_HELP_STRING([--enable-testing],[enable make check tests (default yes)]))
 GCONFIG_FN_ENABLE_TESTING
+AC_ARG_ENABLE([install-hook],AS_HELP_STRING([--enable-install-hook],[enable fixing up the start/stop configuration file at install time (default yes)]))
+GCONFIG_FN_ENABLE_INSTALL_HOOK

-dnl ===
-dnl "--with-doxygen"
+dnl "--with-whatever"
 dnl
 AC_ARG_WITH(doxygen,AS_HELP_STRING([--with-doxygen],[generate source code documentation with doxygen (default auto)]))
 GCONFIG_FN_WITH_DOXYGEN
-
-dnl ===
-dnl "--with-man2html"
-dnl
 AC_ARG_WITH(man2html,AS_HELP_STRING([--with-man2html],[convert man pages to html using man2html (default auto)]))
 GCONFIG_FN_WITH_MAN2HTML
-
-dnl ===
-dnl "--with-openssl"/"--with-mbedtls"
-dnl
 AC_ARG_WITH(openssl,AS_HELP_STRING([--with-openssl],[use openssl for tls layer (default auto)]))
 AC_ARG_WITH(mbedtls,AS_HELP_STRING([--with-mbedtls],[use mbedtls for tls layer (default auto)]))
 GCONFIG_FN_TLS
-
-dnl ===
-dnl "--with-pam"
-dnl
 AC_ARG_WITH(pam,AS_HELP_STRING([--with-pam],[use linux pam for authentication (default auto)]))
 GCONFIG_FN_WITH_PAM

-dnl ===
-dnl "--enable-static-linking"
-dnl
-AC_ARG_ENABLE(static-linking,AS_HELP_STRING([--enable-static-linking],[prefer static linking for some libraries (default no)]))
-GCONFIG_FN_ENABLE_STATIC_LINKING
-
-dnl ===
-dnl "--enable-install-hook"
-dnl
-AC_ARG_ENABLE(install-hook,AS_HELP_STRING([--enable-install-hook],[enable fixing up the start/stop configuration file at install time (default yes)]))
-GCONFIG_FN_ENABLE_INSTALL_HOOK
-
-dnl ===
-dnl directory tweaking ...
-dnl
-dnl define e_ prefixed directory variables
+dnl directory tweaking -- define e_ prefixed directory variables
 dnl
 dnl not AC_PREFIX_DEFAULT([/usr])
-GCONFIG_FN_SET_DIRECTORIES
+GCONFIG_FN_SET_DIRECTORIES_E

-dnl ===
-dnl generate files...
+dnl generate files
 dnl
 AC_CONFIG_FILES([Makefile src/Makefile src/glib/Makefile src/gssl/Makefile src/gnet/Makefile src/gauth/Makefile src/gsmtp/Makefile src/gpop/Makefile src/main/Makefile src/main/icon/Makefile src/win32/Makefile src/gui/Makefile bin/Makefile doc/Makefile etc/Makefile test/Makefile test/certificates/Makefile m4/Makefile bsd/Makefile debian/Makefile])
 AC_OUTPUT

+dnl final warnings
+dnl
+GCONFIG_FN_WARNINGS
--- a/configure.sh
+++ b/configure.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
@ -18,11 +18,15 @@
 #
 # configure.sh
 #
-# A simple wrapper for the configure script.
+# A simple wrapper for the autoconf configure script that specifies
+# more sensible directories depending on the host environment and
+# simplifies cross-compilation to windows or arm.
 #
-# usage: configure.sh [-d] [-m] [<configure-options>]
-#         -d  debug compiler flags (see also --enable-debug)
+# usage: configure.sh [-d] [{-o|-m|-p}] [<configure-options>]
+#         -d  debug compiler flags
+#         -o  openwrt sdk and uclibc (edit as required)
 #         -m  mingw-w64
+#         -p  rpi
 #

 thisdir="`cd \`dirname $0\` && pwd`"
@ -33,11 +37,13 @@ then
 	exit 1
 fi

+enable_debug=""
 if test "$1" = "-d"
 then
 	shift
 	export CFLAGS="-O0 -g"
 	export CXXFLAGS="-O0 -g"
+	if expr "$*" : '.*enable.debug' ; then : ; else enable_debug="--enable-debug" ; fi
 :
 elif expr "$*" : '.*enable.debug' >/dev/null
 then
@ -51,46 +57,102 @@ fi
 if test "$1" = "-m"
 then
 	shift
-	export CXX="i686-w64-mingw32-g++"
-	export CC="i686-w64-mingw32-gcc"
-	export CXXFLAGS="-std=c++11 -pthread"
-	export LDFLAGS="-pthread"
-	$thisdir/configure --host i686-w64-mingw32 --enable-windows --disable-gui --disable-pam \
-		--prefix=/usr --libexecdir=/usr/lib --docdir=/usr/share/doc --mandir=/usr/share/man "$@"
+	TARGET="i686-w64-mingw32"
+	export CXX="$TARGET-g++"
+	export CC="$TARGET-gcc"
+	export AR="$TARGET-ar"
+	export STRIP="$TARGET-strip"
+	export CXXFLAGS="$CXXFLAGS -std=c++11 -pthread"
+	export LDFLAGS="$LDFLAGS -pthread"
+	if test -x "`which $CXX`" ; then : ; else echo "error: no mingw c++ compiler: [$CXX]\n" ; exit 1 ; fi
+	$thisdir/configure $enable_debug --host $TARGET \
+		--enable-windows \
+		--disable-gui --without-pam --without-doxygen \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_initdir=/etc/init.d "$@"
+:
+elif test "$1" = "-p"
+then
+	shift
+	TARGET="arm-linux-gnueabihf"
+	export CXX="$TARGET-g++"
+	export CC="$TARGET-gcc"
+	export AR="$TARGET-ar"
+	export STRIP="$TARGET-strip"
+	export CXXFLAGS="$CXXFLAGS -std=c++11 -pthread"
+	export LDFLAGS="$LDFLAGS -pthread"
+	$thisdir/configure $enable_debug --host $TARGET \
+		--disable-gui --without-pam --without-doxygen \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_initdir=/etc/init.d "$@"
+:
+elif test "$1" = "-o"
+then
+	shift
+    TARGET="mipsel-openwrt-linux-uclibc"
+    SDK_DIR="`find $HOME -maxdepth 3 -type d -iname openwrt-sdk\*uclibc\* 2>/dev/null | sort | head -1`"
+    SDK_TOOLCHAIN_DIR="`find \"$SDK_DIR/staging_dir\" -type d -iname toolchain-\*uclibc\* 2>/dev/null | sort | head -1`"
+    SDK_TARGET_DIR="`find \"$SDK_DIR/staging_dir\" -type d -iname target-\*uclibc\* 2>/dev/null | sort | head -1`"
+    export CC="$SDK_TOOLCHAIN_DIR/bin/$TARGET-gcc"
+    export CXX="$SDK_TOOLCHAIN_DIR/bin/$TARGET-c++"
+    export AR="$SDK_TOOLCHAIN_DIR/bin/$TARGET-ar"
+    export STRIP="$SDK_TOOLCHAIN_DIR/bin/$TARGET-strip"
+    export CXXFLAGS="-fno-rtti -fno-threadsafe-statics -Os $CXXFLAGS"
+    export LDFLAGS="-L$SDK_TARGET_DIR/usr/lib -luClibc++ $LDFLAGS"
+    export CPPFLAGS="-I$SDK_TARGET_DIR/usr/include/uClibc++ $CPPFLAGS"
+	if test -x "$CXX" ; then : ; else echo "error: no c++ compiler for target [$TARGET]: CXX=[$CXX]\n" ; exit 1 ; fi
+	if test -f "$SDK_TARGET_DIR/usr/lib/libuClibc++.so" ; then : ; else echo "error: no uclibc++ library under [$SDK_TARGET_DIR]\n" ; exit 1 ; fi
+    $thisdir/configure $enable_debug --host $TARGET \
+		--disable-gui --without-pam --without-doxygen \
+		--without-mbedtls --disable-std-thread \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_initdir=/etc/init.d "$@"
+    echo export PATH=\"$SDK_TOOLCHAIN_DIR/bin:\$PATH\"
+    echo export STAGING_DIR=\"$SDK_DIR/staging_dir\"
 :
 elif test "`uname`" = "NetBSD"
 then
 	export CPPFLAGS="$CPPFLAGS -I/usr/X11R7/include"
 	export LDFLAGS="$LDFLAGS -L/usr/X11R7/lib"
-	$thisdir/configure --prefix=/usr --libexecdir=/usr/lib --docdir=/usr/share/doc --mandir=/usr/share/man --sysconfdir=/etc e_bsdinitdir=/etc/rc.d "$@"
+	$thisdir/configure $enable_debug \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_bsdinitdir=/etc/rc.d "$@"
 :
 elif test "`uname`" = "FreeBSD"
 then
 	export CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/local/include/libav"
 	export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/local/lib/libav"
-	$thisdir/configure --prefix=/usr/local --mandir=/usr/local/man e_bsdinitdir=/usr/local/etc/rc.d "$@"
+	$thisdir/configure $enable_debug \
+		--prefix=/usr/local --mandir=/usr/local/man \
+		e_bsdinitdir=/usr/local/etc/rc.d "$@"
 :
 elif test "`uname`" = "OpenBSD"
 then
 	export CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
 	export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	$thisdir/configure --prefix=/usr/local --mandir=/usr/local/man e_bsdinitdir=/usr/local/etc/rc.d "$@"
+	$thisdir/configure $enable_debug \
+		--prefix=/usr/local --mandir=/usr/local/man \
+		e_bsdinitdir=/usr/local/etc/rc.d "$@"
 :
 elif test "`uname`" = "Darwin"
 then
 	export CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/X11/include"
 	export LDFLAGS="$LDFLAGS -L/opt/local/lib -L/opt/X11/lib"
-	$thisdir/configure --prefix=/opt/local --mandir=/opt/local/man "$@"
+	$thisdir/configure $enable_debug \
+		--prefix=/opt/local --mandir=/opt/local/man "$@"
 :
 elif test "`uname`" = "Linux"
 then
 	export CPPFLAGS
 	export LDFLAGS
-	$thisdir/configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d e_spooldir=/var/spool/emailrelay "$@"
+	$thisdir/configure $enable_debug \
+		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+		--localstatedir=/var e_initdir=/etc/init.d \
+		e_rundir=/run/emailrelay "$@"
 :
 else
 	export CPPFLAGS="$CPPFLAGS -I/usr/X11R7/include -I/usr/X11R6/include -I/usr/local/include -I/opt/local/include -I/opt/X11/include"
 	export LDFLAGS="$LDFLAGS -L/usr/X11R7/lib -L/usr/X11R6/lib -L/usr/local/lib -L/opt/local/lib -L/opt/X11/lib"
-	$thisdir/configure "$@"
+	$thisdir/configure $enable_debug "$@"
 fi

--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
@ -14,4 +14,17 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-EXTRA_DIST = preinst postinst prerm postrm copyright changelog
+
+EXTRA_DIST = \
+	emailrelay.init \
+	emailrelay.default \
+	changelog \
+	control \
+	compat \
+	copyright \
+	preinst \
+	postinst \
+	prerm \
+	postrm \
+	rules
+
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@ -13,6 +13,9 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
+
+#
+#
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
@ -87,10 +90,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = debian
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -133,6 +136,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -141,15 +145,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -215,6 +217,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
@ -243,10 +246,19 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+EXTRA_DIST = \
+	emailrelay.init \
+	emailrelay.default \
+	changelog \
+	control \
+	compat \
+	copyright \
+	preinst \
+	postinst \
+	prerm \
+	postrm \
+	rules

-#
-#
-EXTRA_DIST = preinst postinst prerm postrm copyright changelog
 all: all-am

 .SUFFIXES:
--- a/debian/changelog
+++ b/debian/changelog
@ -1,6 +1,23 @@
+emailrelay (2.1) unstable; urgency=low
+  * Backwards compatibility features for 1.9-to-2.0 transition removed.
+  * Better handling of too-many-connections on Windows.
+  * New "--idle-timeout" option for server-side connections.
+  * Support for RFC-5782 DNSBL blocking ("--dnsbl").
+  * Filter scripts are given the path of the envelope file in argv2.
+  * Message files can be editied by "--client-filter" scripts.
+  * Better support for CRAM-SHAx authentication.
+  * New "--client-auth-config" and "--server-auth-config" options.
+  * New "--show" option on windows to better control the user interface style.
+  * The "--pop" option always requires "--pop-auth".
+  * No message is spooled if all its envelope recipients are local-mailboxes.
+  * TLS cipher name added to "Received" line as per RFC-8314 4.3.
+  * Certificate contents are not logged.
+  * Timestamp parts of spool filenames no longer limited to six digits.
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Mon, 16 Sep 2019 02:34:03 +0000
+
 emailrelay (2.0.1) unstable; urgency=low
  * Make PLAIN client authentication work against servers with broken 334 responses.
- -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 13 Aug 2019 09:53:07 +0000
+ -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Wed, 14 Aug 2019 00:00:00 +0000

 emailrelay (2.0) unstable; urgency=low
  * Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see "--interface").
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+9
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,17 @@
+Source: emailrelay
+Section: mail
+Priority: optional
+Maintainer: Graeme Walker <graeme_walker@users.sourceforge.net>
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.8
+Homepage: http://emailrelay.sourceforge.net
+
+Package: emailrelay
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: E-mail store-and-forward transfer agent and pop server.
+ E-MailRelay does three things: it stores any incoming e-mail messages that
+ it receives, it forwards e-mail messages on to another remote e-mail server,
+ and it serves up stored e-mail messages to local e-mail reader programs. More
+ technically, it acts as a SMTP storage daemon, a SMTP forwarding agent, and
+ a POP3 server.
--- a/debian/copyright
+++ b/debian/copyright
@ -1,6 +1,6 @@
 Copyright
 =========
-Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>

 Refer to the file COPYING (included), /usr/share/common-licenses/GPL-3, or
 <http://www.gnu.org/licenses/> for the terms of the GNU General Public License.
--- a/debian/emailrelay.default
+++ b/debian/emailrelay.default
@ -0,0 +1,3 @@
+# change this to 1 to enable the emailrelay system-v init script
+# and run 'service emailrelay start' when configured
+EMAILRELAY_ENABLED=0
--- a/debian/emailrelay.init
+++ b/debian/emailrelay.init
@ -0,0 +1,272 @@
+#!/bin/sh
+#
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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, see <http://www.gnu.org/licenses/>.
+# ===
+#
+# emailrelay
+#
+# A start/stop script for E-MailRelay in the SysV init system.
+#
+# usage: emailrelay { start | stop | restart | force-reload | status }
+#
+# See also: install_initd, remove_initd
+#
+### BEGIN INIT INFO
+# Provides:            emailrelay
+# Required-Start:      $local_fs $network $syslog
+# Required-Stop:       $local_fs $network $syslog
+# Default-Start:       2 3 4 5
+# Default-Stop:        0 1 6
+# Short-Description:   E-MailRelay mail server
+### END INIT INFO
+##
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+NAME=emailrelay
+DESC="E-MailRelay mail server"
+CONFIG=/etc/$NAME.conf
+PIDFILE=/run/emailrelay/$NAME.pid
+GROUP=daemon
+DAEMON=/usr/sbin/$NAME
+SUBMIT=/usr/sbin/$NAME-submit
+
+test -f /etc/default/$NAME && . /etc/default/$NAME
+test -f /etc/rc.conf.d/$NAME && . /etc/rc.conf.d/$NAME
+test -f /etc/default/rcS && . /etc/default/rcS
+
+# Default lsb functions in case there is no lsb/init-functions...
+#
+log_success_msg()
+{
+	echo "$@"
+}
+log_failure_msg()
+{
+	echo "$@"
+}
+log_warning_msg()
+{
+	echo "$@"
+}
+start_daemon()
+{
+	if test "`cat \"$2\" 2>/dev/null`" -gt 0 2>/dev/null && kill -0 "`cat \"$2\"`"
+	then
+		: # running already
+	else
+		shift ; shift ; shift
+		"$@"
+	fi
+}
+killproc()
+{
+	shift
+	kill `cat "$1" 2>/dev/null` 2>/dev/null
+}
+pidofproc()
+{
+	shift
+	kill -0 `cat "$1" 2>/dev/null` 2>/dev/null
+}
+log_daemon_msg()
+{
+	echo -n "$@"
+}
+log_progress_msg()
+{
+	:;
+}
+log_end_msg()
+{
+	if test "$1" -eq 0
+	then
+		log_success_msg " ... ok"
+		true
+	else
+		log_failure_msg " ... failed!"
+		false
+	fi
+}
+
+# Setup functions...
+#
+# Some packaging scripts do "emailrelay setup" for some of their
+# post-install steps, and "emailrelay setup" might also be useful
+# administratively after editing the /etc/default file. The "start"
+# sub-command below also uses setup_rundir() because the /run
+# directory will not necessarily persist across a reboot.
+#
+# (This code must come before the potential 'init-functions' redirect
+# to systemd.)
+#
+setup_config()
+{
+	if test ! -f "$CONFIG" -a -f "$CONFIG.template"
+	then
+		cp -p "$CONFIG.template" "$CONFIG"
+	fi
+}
+root_root()
+{
+	# True if the given file exists and is owned by 'root.root',
+	# as if newly copied by the install process and never
+	# subsequently chown'ed by the administrator
+	ls -nd "$1" 2>/dev/null | cut -d' ' --fields=3,4 | grep -q '^0 0$'
+}
+spooldir()
+{
+	# Prints the spool directory path from the config file, but with a
+	# default because packaged installs may not edit the config file
+	# like 'make install' does
+	( echo spool-dir /var/spool/emailrelay ; cat "$CONFIG" ) | \
+		tr '\t' ' ' | sed 's/  */ /g' | grep '^spool-dir [^ ]' | \
+		tail -1 | cut -d' ' -f 2
+}
+setup_rundir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if echo "$1" | grep -q "/emailrelay$"
+	then
+		if root_root "$1"
+		then
+			chgrp "$GROUP" "$1"
+			chmod 775 "$1"
+		fi
+	fi
+}
+setup_rundir()
+{
+	# Recreates the pidfile directory, which might disappear after a reboot
+	setup_rundir_imp "`dirname \"$PIDFILE\"`"
+}
+setup_spooldir_imp()
+{
+	test -d "$1" || mkdir -p "$1"
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 775 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_spooldir()
+{
+	setup_spooldir_imp "`spooldir`"
+}
+setup_sgid()
+{
+	if root_root "$1"
+	then
+		chgrp "$GROUP" "$1"
+		chmod 755 "$1"
+		chmod g+s "$1"
+	fi
+}
+setup_tools()
+{
+	setup_sgid "/usr/sbin/emailrelay-submit"
+	setup_sgid "/usr/lib/emailrelay/emailrelay-filter-copy"
+}
+setup()
+{
+	setup_config
+	setup_rundir
+	setup_spooldir
+	setup_tools
+}
+if test "$1" = "setup" ; then setup ; exit 0 ; fi
+
+# Read lsb init-functions. Annoyingly, systemd sometimes hijacks this to
+# generate a service file under /run/systemd, run systemctl etc, without
+# ever returning to this script.
+#
+test -f /lib/lsb/init-functions && . /lib/lsb/init-functions
+
+# Ignore /etc/default 'enabled' switch if running from systemd.
+#
+# (The 'enabled' mechanism is needed on non-systemd debian distros
+# because the dpkg postinstall script starts the server, whereas
+# on systemd systems the dpkg postinstall script's call to update-rc.d
+# does nothing. On rpm or 'make install' systems the /etc/default file
+# is not installed at all.)
+#
+if test -d /run/systemd/system -a "$PPID" -eq 1
+then
+	EMAILRELAY_ENABLED="1"
+fi
+
+case "$1" in
+
+	restart|force-reload)
+		$0 stop
+		$0 start
+	;;
+
+	try-restart)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
+	*start)
+		if test "${EMAILRELAY_ENABLED:-1}" -eq 1
+		then
+			log_daemon_msg "Starting $DESC"
+			log_progress_msg "$NAME"
+			setup_rundir
+			start_daemon -p "$PIDFILE" -- "$DAEMON" --as-server --syslog --pid-file "$PIDFILE" "$CONFIG"
+			e="$?"
+			log_end_msg $e
+			test "$e" -eq 0
+		else
+			log_warning_msg "$NAME startup is disabled in /etc/default/$NAME"
+			exit 0
+		fi
+		;;
+
+	stop)
+		log_daemon_msg "Stopping $DESC"
+		log_progress_msg "$NAME"
+		killproc -p "$PIDFILE" "$DAEMON"
+		log_end_msg $?
+		;;
+
+	reload)
+		echo `basename $0`: $1 not implemented >&2
+		exit 3
+		;;
+
+	status)
+		if pidofproc -p "$PIDFILE" "$DAEMON" >/dev/null
+		then
+			log_success_msg "$NAME is running"
+			true
+		else
+			log_failure_msg "$NAME is not running"
+			false
+		fi
+		;;
+
+	setup)
+		# never gets here -- see above
+		setup
+		;;
+
+	*)
+		echo usage: `basename $0` "{start|stop|restart|status}" >&2
+		exit 2
+		;;
+
+esac
--- a/debian/postinst
+++ b/debian/postinst
@ -5,32 +5,18 @@

 spool="/var/spool/emailrelay"
 submit="/usr/sbin/emailrelay-submit"
+filtercopy="/usr/lib/emailrelay/emailrelay-filter-copy"
 init="/etc/init.d/emailrelay"
-rundir="/var/run/emailrelay"
+rundir="/run/emailrelay"

 emailrelay_setup()
 {
-	test -d "$spool" || mkdir "$spool"
-	if ls -nd "$spool" | cut -d' ' --fields=3,4 | grep -q '^0 0$'
-	then
-		chgrp daemon "$spool" && chmod 775 "$spool" && chmod g+s "$spool"
-	fi
-
-	test -d "$rundir" || mkdir "$rundir"
-	if ls -nd "$rundir" | cut -d' ' --fields=3,4 | grep -q '^0 0$'
-	then
-		chgrp daemon "$rundir" && chmod 770 "$rundir"
-	fi
-
-	if ls -n "$submit" | cut -d' ' --fields=3,4 | grep -q '^0 0$'
-	then
-		chgrp daemon "$submit" && chmod g+s "$submit"
-	fi
-
-	if test -f "$init" -a ! -x "$init"
+	# use the init script for some post-install setup
+	if test -e "$init" -a ! -x "$init"
 	then
 		chmod +x "$init"
 	fi
+	"$init" setup
 }

 emailrelay_fix_html()
@ -47,9 +33,11 @@ emailrelay_create_config()
 	fi
 }

-#DEBHELPER#
-
 emailrelay_setup
 emailrelay_fix_html
 emailrelay_create_config

+#DEBHELPER#
+
+exit 0
+
--- a/debian/postrm
+++ b/debian/postrm
@ -4,15 +4,30 @@
 #

 spool="/var/spool/emailrelay"
-rundir="/var/run/emailrelay"
+rundir="/run/emailrelay"

-rm -f /usr/share/doc/emailrelay/changelog.html || true
-if test "$1" = "purge"
-then
-	rmdir "$spool" 2>/dev/null || true
-	rmdir "$rundir" 2>/dev/null || true
-	rm /etc/emailrelay.conf 2>/dev/null || true
-fi
+emailrelay_unfix_html()
+{
+	# see postinst
+	rm -f /usr/share/doc/emailrelay/changelog.html
+}
+
+emailrelay_purge()
+{
+	# (purge deliberately fails if spooled messages exist)
+	#rm -rf "$spool" 2>/dev/null
+	rmdir "$spool" 2>/dev/null
+	rmdir "$rundir" 2>/dev/null
+	rm /etc/emailrelay.conf 2>/dev/null
+	rm -rf "/usr/share/doc/emailrelay/doxygen" 2>/dev/null
+}

 #DEBHELPER#

+emailrelay_unfix_html
+if test "$1" = "purge"
+then
+	emailrelay_purge
+fi
+exit 0
+
--- a/debian/preinst
+++ b/debian/preinst
@ -3,18 +3,5 @@
 # preinst
 #

-spool="/var/spool/emailrelay"
-
-create_spool()
-{
-	test -d "$spool" || mkdir "$spool"
-	if ls -nd "$spool" | cut -d' ' --fields=3,4 | grep -q '^0 0$'
-	then
-		chgrp daemon "$spool" && chmod 775 "$spool"
-	fi
-}
-
-create_spool
-
 #DEBHELPER#

--- a/debian/prerm
+++ b/debian/prerm
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+#
+# rules
+#
+# See dh(1) and debhelper(7)
+#
+
+%:
+	dh $@ --with autotools_dev
+
+override_dh_auto_configure:
+	# (the init script goes to one side under /usr/lib since we have debian/emailrelay.init)
+	dh_auto_configure -- --libexecdir=/usr/lib e_initdir=/usr/lib/emailrelay/init e_rundir=/run/emailrelay --without-doxygen --without-man2html --with-openssl --without-mbedtls --with-pam --disable-gui --disable-install-hook --disable-testing
+
--- a/2
+++ b/2
@ -3,7 +3,7 @@

 scriptversion=2013-05-30.07; # UTC

-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.

 # 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
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
@ -23,7 +23,7 @@ txt_files_install=\
 	windows.txt windows.md windows.rst \
 	changelog.txt changelog.md changelog.rst \
 	doxygen.cfg.in \
-	index.rst conf.py
+	index.rst conf.py.sphinx

 man_files_install=\
 	emailrelay.1 \
@ -83,7 +83,7 @@ man1_MANS = $(man_files_install)
 e_doc_DATA = $(txt_files_install) $(html_files_install) $(css_files_install) $(png_files_install)
 CLEANFILES = $(noinst_SCRIPTS) $(man_files_clean) doxygen.out doxygen.cfg doxygen/search/* doxygen/*

-SUFFIXES = .txt .html .mu
+SUFFIXES = .txt .html

 run_doxygen=$(top_srcdir)/bin/doxygen.sh

@ -125,10 +125,11 @@ md:

 .PHONY: sphinx
 sphinx:
+	cp conf.py.sphinx conf.py
 	sphinx-build -b html . ./_build

 .PHONY: website
 website:
 	@chmod +x make-website || true
-	./make-website 2.0
+	./make-website 2.1

--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -92,10 +92,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -171,6 +171,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -179,15 +180,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -253,6 +252,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
@ -289,7 +289,7 @@ txt_files_install = \
 	windows.txt windows.md windows.rst \
 	changelog.txt changelog.md changelog.rst \
 	doxygen.cfg.in \
-	index.rst conf.py
+	index.rst conf.py.sphinx

 man_files_install = \
 	emailrelay.1 \
@ -347,12 +347,12 @@ noinst_SCRIPTS = .dox
 man1_MANS = $(man_files_install)
 e_doc_DATA = $(txt_files_install) $(html_files_install) $(css_files_install) $(png_files_install)
 CLEANFILES = $(noinst_SCRIPTS) $(man_files_clean) doxygen.out doxygen.cfg doxygen/search/* doxygen/*
-SUFFIXES = .txt .html .mu
+SUFFIXES = .txt .html
 run_doxygen = $(top_srcdir)/bin/doxygen.sh
 all: all-am

 .SUFFIXES:
-.SUFFIXES: .txt .html .mu
+.SUFFIXES: .txt .html
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@ -643,12 +643,13 @@ md:

 .PHONY: sphinx
 sphinx:
+	cp conf.py.sphinx conf.py
 	sphinx-build -b html . ./_build

 .PHONY: website
 website:
 	@chmod +x make-website || true
-	./make-website 2.0
+	./make-website 2.1

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/doc/authentication.svg
+++ b/doc/authentication.svg
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
--- a/doc/changelog.html
+++ b/doc/changelog.html
@ -9,11 +9,28 @@
  <!-- index:0::::E-MailRelay Change Log -->
 <div class="div-main">
  <h1><a class="a-header" name="H_1">E-MailRelay Change Log</a></h1> <!-- index:1:H:1::E-MailRelay Change Log -->
-   <h2><a class="a-header" name="SH_1_1">2.0 -> 2.0.1</a></h2> <!-- index:2:SH:1:1:2.0 -> 2.0.1 -->
+   <h2><a class="a-header" name="SH_1_1">2.0.1 -> 2.1</a></h2> <!-- index:2:SH:1:1:2.0.1 -> 2.1 -->
+    <ul>
+     <li>Backwards compatibility features for 1.9-to-2.0 transition removed.</li>
+     <li>Better handling of too-many-connections on Windows.</li>
+     <li>New <em>--idle-timeout</em> option for server-side connections.</li>
+     <li>Support for RFC-5782 DNSBL blocking (<em>--dnsbl</em>).</li>
+     <li>Filter scripts are given the path of the envelope file in argv2.</li>
+     <li>Message files can be editied by <em>--client-filter</em> scripts.</li>
+     <li>Better support for CRAM-SHAx authentication.</li>
+     <li>New <em>--client-auth-config</em> and <em>--server-auth-config</em> options.</li>
+     <li>New <em>--show</em> option on windows to better control the user interface style.</li>
+     <li>The <em>--pop</em> option always requires <em>--pop-auth</em>.</li>
+     <li>No message is spooled if all its envelope recipients are local-mailboxes.</li>
+     <li>TLS cipher name added to <em>Received</em> line as per RFC-8314 4.3.</li>
+     <li>Certificate contents are not logged.</li>
+     <li>Timestamp parts of spool filenames no longer limited to six digits.</li>
+    </ul>
+   <h2><a class="a-header" name="SH_1_2">2.0 -> 2.0.1</a></h2> <!-- index:2:SH:1:2:2.0 -> 2.0.1 -->
    <ul>
     <li>Make PLAIN client authentication work against servers with broken 334 responses.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_2">1.9.2 -> 2.0</a></h2> <!-- index:2:SH:1:2:1.9.2 -> 2.0 -->
+   <h2><a class="a-header" name="SH_1_3">1.9.2 -> 2.0</a></h2> <!-- index:2:SH:1:3:1.9.2 -> 2.0 -->
    <ul>
     <li>Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see <em>--interface</em>).</li>
     <li>Server process is not blocked during <em>--filter</em> or <em>--address-verifier</em> execution, if multi-threaded.</li>
@ -44,7 +61,7 @@
     <li>C++ 2011 is preferred, and required for multi-threading.</li>
     <li>Support for very old versions of Windows is dropped.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_3">1.9.1 -> 1.9.2</a></h2> <!-- index:2:SH:1:3:1.9.1 -> 1.9.2 -->
+   <h2><a class="a-header" name="SH_1_4">1.9.1 -> 1.9.2</a></h2> <!-- index:2:SH:1:4:1.9.1 -> 1.9.2 -->
    <ul>
     <li>Fixed a leak in the event-loop garbage collection.</li>
     <li>A local hostname that fails to resolve is not an error.</li>
@ -60,11 +77,11 @@
     <li>Qt4 or Qt5 selected by the <em>configure</em> script.</li>
     <li>Improved the RPM spec file.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_4">1.9 -> 1.9.1</a></h2> <!-- index:2:SH:1:4:1.9 -> 1.9.1 -->
+   <h2><a class="a-header" name="SH_1_5">1.9 -> 1.9.1</a></h2> <!-- index:2:SH:1:5:1.9 -> 1.9.1 -->
    <ul>
     <li>Updated OpenSSL from 1.0.1e to 1.0.1g in the Windows build.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_5">1.8.2 -> 1.9</a></h2> <!-- index:2:SH:1:5:1.8.2 -> 1.9 -->
+   <h2><a class="a-header" name="SH_1_6">1.8.2 -> 1.9</a></h2> <!-- index:2:SH:1:6:1.8.2 -> 1.9 -->
    <ul>
     <li>Added negotiated TLS/SSL for POP (ie. <em>STLS</em>).</li>
     <li>The first two fields in the secrets files are reordered (with backwards compatibility).</li>
@ -89,17 +106,17 @@
     <li>Added Windows <em>--peer-lookup</em> option.</li>
     <li>Fix for MD5 code in 64-bit builds.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_6">1.8.1 -> 1.8.2</a></h2> <!-- index:2:SH:1:6:1.8.1 -> 1.8.2 -->
+   <h2><a class="a-header" name="SH_1_7">1.8.1 -> 1.8.2</a></h2> <!-- index:2:SH:1:7:1.8.1 -> 1.8.2 -->
    <ul>
     <li>Fix namespaces for gcc 3.4.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_7">1.8 -> 1.8.1</a></h2> <!-- index:2:SH:1:7:1.8 -> 1.8.1 -->
+   <h2><a class="a-header" name="SH_1_8">1.8 -> 1.8.1</a></h2> <!-- index:2:SH:1:8:1.8 -> 1.8.1 -->
    <ul>
     <li>Changed the definition of <em>--as-proxy</em> to use <em>--poll 0</em> rather than <em>--immediate</em> [bug-id 1961652].</li>
     <li>Fixed stalling bug when using server-side TLS/SSL (<em>--server-tls</em>) [bug-id 1961655].</li>
     <li>Improved Debian packaging for Linux (<em>make deb</em>).</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_8">1.7 -> 1.8</a></h2> <!-- index:2:SH:1:8:1.7 -> 1.8 -->
+   <h2><a class="a-header" name="SH_1_9">1.7 -> 1.8</a></h2> <!-- index:2:SH:1:9:1.7 -> 1.8 -->
    <ul>
     <li>Speed optimisations (as identified by KCachegrind/valgrind in KDevelop).</li>
     <li>Build-time size optimisations (eg. <em>./configure --disable-exec --enable-small-exceptions ...</em>).</li>
@ -115,7 +132,7 @@
     <li>Improved native support for Mac OS X (10.5) with graphical installation from disk image.</li>
     <li>Compatibility with gcc 2.95 restored.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_9">1.6 -> 1.7</a></h2> <!-- index:2:SH:1:9:1.6 -> 1.7 -->
+   <h2><a class="a-header" name="SH_1_10">1.6 -> 1.7</a></h2> <!-- index:2:SH:1:10:1.6 -> 1.7 -->
    <ul>
     <li>TLS/SSL support for SMTP using OpenSSL (<em>./configure --with-openssl</em> with <em>--client-tls</em> and <em>--server-tls</em>).</li>
     <li>Authentication mechanism <em>PLAIN</em> added.</li>
@ -123,7 +140,7 @@
     <li>Windows service wrapper has an <em>--uninstall</em> option.</li>
     <li>Windows installation GUI uninstalls the service before reinstalling it.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_10">1.5 -> 1.6</a></h2> <!-- index:2:SH:1:10:1.5 -> 1.6 -->
+   <h2><a class="a-header" name="SH_1_11">1.5 -> 1.6</a></h2> <!-- index:2:SH:1:11:1.5 -> 1.6 -->
    <ul>
     <li>GPLv3 licence (see <em>http://gplv3.fsf.org</em>).</li>
     <li>New <em>--prompt-timeout</em> switch for the timeout when waiting for the initial 220 prompt from the SMTP server.</li>
@ -143,7 +160,7 @@
     <li>Experimental SpamAssassin spamc/spamd protocol support.</li>
     <li>Acceptance tests added to the distribution.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_11">1.4 -> 1.5</a></h2> <!-- index:2:SH:1:11:1.4 -> 1.5 -->
+   <h2><a class="a-header" name="SH_1_12">1.4 -> 1.5</a></h2> <!-- index:2:SH:1:12:1.4 -> 1.5 -->
    <ul>
     <li>New installation and configuration GUI using TrollTech Qt 4.x (<em>./configure --enable-gui</em>)</li>
     <li>Default address verifier accepts all addresses as valid and never treats them as local mailboxes.</li>
@ -158,7 +175,7 @@
     <li>Documentation also created in docbook format (requires xmlto).</li>
     <li>Windows installation document revised.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_12">1.3.3 -> 1.4</a></h2> <!-- index:2:SH:1:12:1.3.3 -> 1.4 -->
+   <h2><a class="a-header" name="SH_1_13">1.3.3 -> 1.4</a></h2> <!-- index:2:SH:1:13:1.3.3 -> 1.4 -->
    <ul>
     <li>POP3 server (enable with <em>--pop</em>, disable at build-time with <em>./configure --disable-pop</em>).</li>
     <li>Fix for logging reentrancy bug (affects <em>./configure --enable-debug</em> with <em>--debug</em>).</li>
@ -172,7 +189,7 @@
     <li>The <em>--dont-listen</em> switch is now <em>--no-smtp</em>.</li>
     <li>Better IPv6 support (Linux only).</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_13">1.3.2 -> 1.3.3</a></h2> <!-- index:2:SH:1:13:1.3.2 -> 1.3.3 -->
+   <h2><a class="a-header" name="SH_1_14">1.3.2 -> 1.3.3</a></h2> <!-- index:2:SH:1:14:1.3.2 -> 1.3.3 -->
    <ul>
     <li>No bind() for outgoing connections [bug-id 1051689].</li>
     <li>Updated rpm spec file [bug-id 1224850].</li>
@ -181,21 +198,21 @@
     <li>Documentation of <em>auth</em> switches corrected.</li>
     <li>State-machine template type declaration modernised, possibly breaking older compilers.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_14">1.3.1 -> 1.3.2</a></h2> <!-- index:2:SH:1:14:1.3.1 -> 1.3.2 -->
+   <h2><a class="a-header" name="SH_1_15">1.3.1 -> 1.3.2</a></h2> <!-- index:2:SH:1:15:1.3.1 -> 1.3.2 -->
    <ul>
     <li>Fix for core dump when <em>--client-filter</em> pre-processing fails.</li>
     <li>Revised code structure to prepare for asynchronous pre-processing.</li>
     <li>Better diagnostics when pre-processor exec() fails.</li>
     <li>Better cleanup of empty and orphaned files.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_15">1.3 -> 1.3.1</a></h2> <!-- index:2:SH:1:15:1.3 -> 1.3.1 -->
+   <h2><a class="a-header" name="SH_1_16">1.3 -> 1.3.1</a></h2> <!-- index:2:SH:1:16:1.3 -> 1.3.1 -->
    <ul>
     <li>Windows resource leak from CreateProcess() fixed.</li>
     <li>Windows dialog box double-close fix.</li>
     <li>Some documentation for the <em>--scanner</em> switch.</li>
     <li>New usage patterns section in the user guide.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_16">1.2 -> 1.3</a></h2> <!-- index:2:SH:1:16:1.2 -> 1.3 -->
+   <h2><a class="a-header" name="SH_1_17">1.2 -> 1.3</a></h2> <!-- index:2:SH:1:17:1.2 -> 1.3 -->
    <ul>
     <li>Client protocol waits for a greeting from the server on startup [bug-id 842156].</li>
     <li>Fix for incorrect backslash normalisation on <em>--verifier</em> command-lines containing spaces [bug-id 890646].</li>
@ -208,7 +225,7 @@
     <li>New switches for the <em>configure</em> script.</li>
     <li>More JavaScript example scripts.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_17">1.1.2 -> 1.2</a></h2> <!-- index:2:SH:1:17:1.1.2 -> 1.2 -->
+   <h2><a class="a-header" name="SH_1_18">1.1.2 -> 1.2</a></h2> <!-- index:2:SH:1:18:1.1.2 -> 1.2 -->
    <ul>
     <li>The <em>--filter</em> and <em>--verifier</em> arguments interpreted as command-lines; spaces in executable paths now need escaping.</li>
     <li>The <em>--interface</em> switch applies to outgoing connections too.</li>
@ -217,7 +234,7 @@
     <li>Fix for dangling reference bug, seen after <em>quit</em> command on Windows.</li>
     <li>JavaScript examples in the documentation.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_18">1.1.1 -> 1.1.2</a></h2> <!-- index:2:SH:1:18:1.1.1 -> 1.1.2 -->
+   <h2><a class="a-header" name="SH_1_19">1.1.1 -> 1.1.2</a></h2> <!-- index:2:SH:1:19:1.1.1 -> 1.1.2 -->
    <ul>
     <li>Earlier check for un-bindable ports on startup, and later fork()ing [bug-id 776972].</li>
     <li>Resolved the file-descriptor kludge for <em>--verifier</em> on Windows.</li>
@ -226,7 +243,7 @@
     <li>Pre-processor (<em>--filter</em>) program's standard output searched for a failure reason string.</li>
     <li>Undocumented <em>--scanner</em> switch added for asynchronous processing by a separate network server.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_19">1.1.0 -> 1.1.1</a></h2> <!-- index:2:SH:1:19:1.1.0 -> 1.1.1 -->
+   <h2><a class="a-header" name="SH_1_20">1.1.0 -> 1.1.1</a></h2> <!-- index:2:SH:1:20:1.1.0 -> 1.1.1 -->
    <ul>
     <li>Restored the fix for building with gcc2.96.</li>
     <li>Support for MinGW builds on Windows.</li>
@ -236,7 +253,7 @@
     <li>Fix for <em>make install</em> when <em>man2html</em> is not available.</li>
     <li>Updated init script.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_20">1.0.2 -> 1.1.0</a></h2> <!-- index:2:SH:1:20:1.0.2 -> 1.1.0 -->
+   <h2><a class="a-header" name="SH_1_21">1.0.2 -> 1.1.0</a></h2> <!-- index:2:SH:1:21:1.0.2 -> 1.1.0 -->
    <ul>
     <li>In proxy mode unexpected client-side disconnects and timeouts do not leave <em>.bad</em> files [see also bug-id 659039].</li>
     <li>By default proxy mode does not interpret addresses for local delivery (<em>--postmaster</em>).</li>
@ -251,14 +268,14 @@
     <li>Support for Sun WorkShop 5.0 added.</li>
     <li>Documentation overhaul.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_21">1.0.0 -> 1.0.2</a></h2> <!-- index:2:SH:1:21:1.0.0 -> 1.0.2 -->
+   <h2><a class="a-header" name="SH_1_22">1.0.0 -> 1.0.2</a></h2> <!-- index:2:SH:1:22:1.0.0 -> 1.0.2 -->
    <ul>
     <li>Support for trusted IP addresses, allowing certain clients to avoid authentication.</li>
     <li>Address verifier interface extended to include authentication information.</li>
     <li>New public mail relay section added to the user guide.</li>
     <li>Example verifier scripts etc. added to the reference guide.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_22">1.0.0 -> 1.0.1</a></h2> <!-- index:2:SH:1:22:1.0.0 -> 1.0.1 -->
+   <h2><a class="a-header" name="SH_1_23">1.0.0 -> 1.0.1</a></h2> <!-- index:2:SH:1:23:1.0.0 -> 1.0.1 -->
    <ul>
     <li>In proxy mode unexpected client-side disconnects and timeouts result in <em>.bad</em> files [bug-id 659039].</li>
     <li>Require successful <em>AUTH</em> before <em>MAIL FROM</em> when using <em>--server-auth</em>.</li>
@ -271,7 +288,7 @@
     <li>Fix build when using gcc2.96 rather than gcc2.95 (1.0.0-pl1).</li>
     <li>Fix default spool directory in example scripts (1.0.0-pl1).</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_23">0.9.9 -> 1.0.0</a></h2> <!-- index:2:SH:1:23:0.9.9 -> 1.0.0 -->
+   <h2><a class="a-header" name="SH_1_24">0.9.9 -> 1.0.0</a></h2> <!-- index:2:SH:1:24:0.9.9 -> 1.0.0 -->
    <ul>
     <li>Briefer <em>--help</em> output; works with <em>--verbose</em>.</li>
     <li>Option to listen on a specific network interface (<em>--interface</em>).</li>
@ -284,7 +301,7 @@
     <li>EHLO response parsing is now case-insensitive [bug-id 561522].</li>
     <li>Fewer missing-secrets warnings [bug-id 564987].</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_24">0.9.8 -> 0.9.9</a></h2> <!-- index:2:SH:1:24:0.9.8 -> 0.9.9 -->
+   <h2><a class="a-header" name="SH_1_25">0.9.8 -> 0.9.9</a></h2> <!-- index:2:SH:1:25:0.9.8 -> 0.9.9 -->
    <ul>
     <li>More flexible logging options (<em>--verbose</em> and <em>--debug</em> work better).</li>
     <li>File Hierarchy Standard (FHS) option for <em>configure</em> (<em>--enable-fhs</em>).</li>
@ -300,14 +317,14 @@
     <li>Submit utility works under Windows. [rc2]</li>
     <li>Improved Windows project files. [rc2]</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_25">0.9.7 -> 0.9.8</a></h2> <!-- index:2:SH:1:25:0.9.7 -> 0.9.8 -->
+   <h2><a class="a-header" name="SH_1_26">0.9.7 -> 0.9.8</a></h2> <!-- index:2:SH:1:26:0.9.7 -> 0.9.8 -->
    <ul>
     <li>Fix for running pre-processor (<em>--filter</em>) as root.</li>
     <li>Ignore bogus <em>AUTH=LOGIN</em> lines in EHLO response.</li>
     <li>Submit utility improved to work with mutt.</li>
     <li>Installation of submit man page.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_26">0.9.6 -> 0.9.7</a></h2> <!-- index:2:SH:1:26:0.9.6 -> 0.9.7 -->
+   <h2><a class="a-header" name="SH_1_27">0.9.6 -> 0.9.7</a></h2> <!-- index:2:SH:1:27:0.9.6 -> 0.9.7 -->
    <ul>
     <li>CRAM-MD5 authentication mechanism added.</li>
     <li>Revoke root permissions at start up, and reclaim them when needed.</li>
@ -323,7 +340,7 @@
     <li>Submission utility <em>emailrelay-submit</em> added.</li>
     <li>HTML4.0 compliant HTML documentation, using CSS.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_27">0.9.5 -> 0.9.6</a></h2> <!-- index:2:SH:1:27:0.9.5 -> 0.9.6 -->
+   <h2><a class="a-header" name="SH_1_28">0.9.5 -> 0.9.6</a></h2> <!-- index:2:SH:1:28:0.9.5 -> 0.9.6 -->
    <ul>
     <li>SMTP AUTHentication extension -- LOGIN mechanism only.</li>
     <li>Client-side protocol timeout.</li>
@ -333,7 +350,7 @@
     <li>Multiple hard-coded listening addresses supported at compile-time.</li>
     <li>Fix for automatic reopening of stderr stream.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_28">0.9.4 -> 0.9.5</a></h2> <!-- index:2:SH:1:28:0.9.4 -> 0.9.5 -->
+   <h2><a class="a-header" name="SH_1_29">0.9.4 -> 0.9.5</a></h2> <!-- index:2:SH:1:29:0.9.4 -> 0.9.5 -->
    <p>
     Windows fixes and improvements...
    </p>
@ -343,14 +360,14 @@
     <li>fix for content file deletion</li>
     <li>fix for directory iterator</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_29">0.9.3 -> 0.9.4</a></h2> <!-- index:2:SH:1:29:0.9.3 -> 0.9.4 -->
+   <h2><a class="a-header" name="SH_1_30">0.9.3 -> 0.9.4</a></h2> <!-- index:2:SH:1:30:0.9.3 -> 0.9.4 -->
    <ul>
     <li>Fixed memory leak when no <em>--log</em> switch.</li>
     <li>Windows build is more <em>gui</em> and less <em>command-line</em>.</li>
     <li><em>Info</em> command added to the administration interface.</li>
     <li>Doxygen files removed from binary RPM.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_30">0.9.2 -> 0.9.3</a></h2> <!-- index:2:SH:1:30:0.9.2 -> 0.9.3 -->
+   <h2><a class="a-header" name="SH_1_31">0.9.2 -> 0.9.3</a></h2> <!-- index:2:SH:1:31:0.9.2 -> 0.9.3 -->
    <ul>
     <li>Proxy mode (<em>--immediate</em> and <em>--as-proxy</em>).</li>
     <li>Message pre-processing (<em>--filter</em>).</li>
@ -358,7 +375,7 @@
     <li>Improved notification script, with MIME encoding.</li>
     <li>Builds with old 2.91 version of gcc.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_31">0.9.1 -> 0.9.2</a></h2> <!-- index:2:SH:1:31:0.9.1 -> 0.9.2 -->
+   <h2><a class="a-header" name="SH_1_32">0.9.1 -> 0.9.2</a></h2> <!-- index:2:SH:1:32:0.9.1 -> 0.9.2 -->
    <ul>
     <li>Better autoconf detection.</li>
     <li>Workround for FreeBSD uname() feature.</li>
@ -366,7 +383,7 @@
     <li>Fixed a benign directory iterator bug.</li>
     <li>Use of gcc's <em>exception</em> header.</li>
    </ul>
-   <h2><a class="a-header" name="SH_1_32">0.9 -> 0.9.1</a></h2> <!-- index:2:SH:1:32:0.9 -> 0.9.1 -->
+   <h2><a class="a-header" name="SH_1_33">0.9 -> 0.9.1</a></h2> <!-- index:2:SH:1:33:0.9 -> 0.9.1 -->
    <ul>
     <li>Improved documentation from doxygen.</li>
     <li>More complete use of namespaces.</li>
@ -376,3 +393,4 @@
 </div> <!-- div-main -->
 </body>
 </html>
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/changelog.md
+++ b/doc/changelog.md
@ -1,6 +1,24 @@
 E-MailRelay Change Log
 ======================

+2.0.1 -> 2.1
+------------
+
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New `--idle-timeout` option for server-side connections.
+* Support for [RFC-5782][] [DNSBL][] blocking (`--dnsbl`).
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be editied by `--client-filter` scripts.
+* Better support for CRAM-SHAx authentication.
+* New `--client-auth-config` and `--server-auth-config` options.
+* New `--show` option on windows to better control the user interface style.
+* The `--pop` option always requires `--pop-auth`.
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* [TLS][] cipher name added to `Received` line as per [RFC-8314][] 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
 2.0 -> 2.0.1
 ------------

@ -11,7 +29,7 @@ E-MailRelay Change Log

 * Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see `--interface`).
 * Server process is not blocked during `--filter` or `--address-verifier` execution, if multi-threaded.
-* Support for the `mbedTLS` [TLS][] library as an alternative to OpenSSL (`configure --with-mbedtls`).
+* Support for the `mbedTLS` TLS library as an alternative to OpenSSL (`configure --with-mbedtls`).
 * TLS server certificates specified with new `--server-tls-certificate` option, not `--server-tls`.
 * TLS servers enable client certificate verification with `--server-tls-verify`, not `--tls-config`.
 * TLS clients can verify server certificates with `--client-tls-verify` and `--client-tls-verify-name`.
@ -46,7 +64,7 @@ E-MailRelay Change Log
 * A warning is emitted if there is more than one client authentication secret.
 * Multiple `--interface` options are allowed separately on the command-line.
 * Added a new `--client-interface` option.
-* The `Received` line is formatted as per RFC-3848 (`with ESMTPSA`).
+* The `Received` line is formatted as per [RFC-3848][] (`with ESMTPSA`).
 * The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
 * The Windows service wrapper can use a configuration file to locate the startup batch file.
 * Simplified the implementation of the GUI installation program.
@ -395,9 +413,13 @@ Windows fixes and improvements...
 * Experimental compile-time support for IPv6.


+[DNSBL]: https://en.wikipedia.org/wiki/DNSBL
 [FHS]: https://wiki.linuxfoundation.org/lsb/fhs
 [PAM]: https://en.wikipedia.org/wiki/Linux_PAM
 [POP]: https://en.wikipedia.org/wiki/Post_Office_Protocol
+[RFC-3848]: https://tools.ietf.org/html/rfc3848
+[RFC-5782]: https://tools.ietf.org/html/rfc5782
+[RFC-8314]: https://tools.ietf.org/html/rfc8314
 [SMTP]: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
 [SOCKS]: https://en.wikipedia.org/wiki/SOCKS
 [TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@ -2,6 +2,24 @@
 E-MailRelay Change Log
 **********************

+2.0.1 -> 2.1
+============
+
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New *--idle-timeout* option for server-side connections.
+* Support for RFC-5782_ DNSBL_ blocking (\ *--dnsbl*\ ).
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be editied by *--client-filter* scripts.
+* Better support for CRAM-SHAx authentication.
+* New *--client-auth-config* and *--server-auth-config* options.
+* New *--show* option on windows to better control the user interface style.
+* The *--pop* option always requires *--pop-auth*.
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS_ cipher name added to *Received* line as per RFC-8314_ 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
 2.0 -> 2.0.1
 ============

@ -12,7 +30,7 @@ E-MailRelay Change Log

 * Improved IPv6 support, with IPv4 and IPv6 used independently at run-time (see *--interface*).
 * Server process is not blocked during *--filter* or *--address-verifier* execution, if multi-threaded.
-* Support for the *mbedTLS* TLS_ library as an alternative to OpenSSL (\ *configure --with-mbedtls*\ ).
+* Support for the *mbedTLS* TLS library as an alternative to OpenSSL (\ *configure --with-mbedtls*\ ).
 * TLS server certificates specified with new *--server-tls-certificate* option, not *--server-tls*.
 * TLS servers enable client certificate verification with *--server-tls-verify*, not *--tls-config*.
 * TLS clients can verify server certificates with *--client-tls-verify* and *--client-tls-verify-name*.
@ -47,7 +65,7 @@ E-MailRelay Change Log
 * A warning is emitted if there is more than one client authentication secret.
 * Multiple *--interface* options are allowed separately on the command-line.
 * Added a new *--client-interface* option.
-* The *Received* line is formatted as per RFC-3848 (\ *with ESMTPSA*\ ).
+* The *Received* line is formatted as per RFC-3848_ (\ *with ESMTPSA*\ ).
 * The LOGIN and PLAIN mechanisms in the secrets file are now equivalent.
 * The Windows service wrapper can use a configuration file to locate the startup batch file.
 * Simplified the implementation of the GUI installation program.
@ -396,9 +414,13 @@ Windows fixes and improvements...
 * Experimental compile-time support for IPv6.


+.. _DNSBL: https://en.wikipedia.org/wiki/DNSBL
 .. _FHS: https://wiki.linuxfoundation.org/lsb/fhs
 .. _PAM: https://en.wikipedia.org/wiki/Linux_PAM
 .. _POP: https://en.wikipedia.org/wiki/Post_Office_Protocol
+.. _RFC-3848: https://tools.ietf.org/html/rfc3848
+.. _RFC-5782: https://tools.ietf.org/html/rfc5782
+.. _RFC-8314: https://tools.ietf.org/html/rfc8314
 .. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
 .. _SOCKS: https://en.wikipedia.org/wiki/SOCKS
 .. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@ -1,6 +1,23 @@
 E-MailRelay Change Log
 ======================

+2.0.1 -> 2.1
+------------
+* Backwards compatibility features for 1.9-to-2.0 transition removed.
+* Better handling of too-many-connections on Windows.
+* New "--idle-timeout" option for server-side connections.
+* Support for RFC-5782 DNSBL blocking ("--dnsbl").
+* Filter scripts are given the path of the envelope file in argv2.
+* Message files can be editied by "--client-filter" scripts.
+* Better support for CRAM-SHAx authentication.
+* New "--client-auth-config" and "--server-auth-config" options.
+* New "--show" option on windows to better control the user interface style.
+* The "--pop" option always requires "--pop-auth".
+* No message is spooled if all its envelope recipients are local-mailboxes.
+* TLS cipher name added to "Received" line as per RFC-8314 4.3.
+* Certificate contents are not logged.
+* Timestamp parts of spool filenames no longer limited to six digits.
+
 2.0 -> 2.0.1
 ------------
 * Make PLAIN client authentication work against servers with broken 334 responses.
--- a/doc/conf.py.sphinx
+++ b/doc/conf.py.sphinx
@ -7,10 +7,10 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'E-MailRelay'
-copyright = u'2018, Graeme Walker'
+copyright = u'2019, Graeme Walker'
 author = u'Graeme Walker'
-version = u'2.0'
-release = u'2.0'
+version = u'2.1'
+release = u'2.1'
 language = None
 today_fmt = '%Y-%m-%d'
 exclude_patterns = []
--- a/doc/developer.html
+++ b/doc/developer.html
@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "%-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
  <title>E-MailRelay Developer Guide</title>
@ -23,7 +23,7 @@
    <p>
     E-MailRelay started life at a time when Linux had no decent package manager and
     Windows was in the grip of DLL hell. As a result, a key principle is that it
-     has no dependencies other than a decent C++ runtime. Since that time OpenSSL
+     has no dependencies other than a good C++ runtime. Since that time OpenSSL
     has been introduced as a dependency to support TLS encryption, and the optional
     configuration and installation GUI has been developed using the Qt toolkit.
    </p>
@ -39,20 +39,20 @@
    </p>

    <p>
-     The header files <em class="quote">gdef.h</em> in <em class="quote">src/glib</em> is used to fix up some compiler
+     The header files <em>gdef.h</em> in <em>src/glib</em> is used to fix up some compiler
     portability issues such as missing standard types, non-standard system headers
-     etc. Conditional compilation directives (<em class="quote">#ifdef</em> etc.) are largely confined
+     etc. Conditional compilation directives (<em>#ifdef</em> etc.) are largely confined
     this file in order to improve readability.
    </p>

    <p>
     Windows/Unix portability is generally addressed by providing a common class
     declaration with two implementations. The implementations are put into separate
-     source files with a <em class="quote">_unix</em> or <em class="quote">_win32</em> suffix, and if necessary a 'pimple' (or
+     source files with a <em>_unix</em> or <em>_win32</em> suffix, and if necessary a 'pimple' (or
     'Bridge') pattern is used to keep the o/s-specific details out of the header.
     If only small parts of the implementation are o/s-specific then there can be
-     three source files per header. For example, <em class="quote">gsocket.cpp</em>, <em class="quote">gsocket_win32.cpp</em>
-     and <em class="quote">gsocket_unix.cpp</em> in the <em class="quote">src/gnet</em> directory.
+     three source files per header. For example, <em>gsocket.cpp</em>, <em>gsocket_win32.cpp</em>
+     and <em>gsocket_unix.cpp</em> in the <em>src/gnet</em> directory.
    </p>

    <p>
@ -65,7 +65,7 @@
     This event model means that the server can handle multiple network connections
     simultaneously from a single thread, and even if multi-threading is disabled at
     build-time the only blocking occurs when external programs are executed (see
-     <em class="quote">--filter</em> and <em class="quote">--address-verifier</em>).
+     <em>--filter</em> and <em>--address-verifier</em>).
    </p>

    <p>
@ -77,7 +77,7 @@

    <p>
     The advantages of a non-blocking event model are discussed in the well-known
-     <a class="a-href" href="http://www.kegel.com/c10k.html">C10K Problem</a> document.
+     <a href="http://www.kegel.com/c10k.html">C10K Problem</a> document.
    </p>

    <p>
@ -87,34 +87,44 @@
     supporting signal multicasting, so each signal connects to no more than one
     slot.
    </p>
+
+    <p>
+     The synchronous slot/signal pattern needs some care when when the signalling
+     object gets destructed as a side-effect of raising a signal, and that situation
+     can be non-obvious precisely because of the slot/signal code decoupling. In
+     most cases signals are emitted at the end of a function and the stack unwinds
+     back to the event loop immediately afterwards, but in other situations,
+     particularly when emitting more than one signal, defensive measures are
+     required.
+    </p>
   <h2><a class="a-header" name="SH_1_5">Module structure</a></h2> <!-- index:2:SH:1:5:Module structure -->
    <p>
     The main C++ libraries in the E-MailRelay code base are as follows:
    </p>

    <dl>
-     <dt><em class="quote">glib</em></dt>
+     <dt><em>glib</em></dt>
      <dd>
       Low-level classes for file-system abstraction, date and time representation,
       string utility functions, logging, command line parsing etc.
      </dd>
-     <dt><em class="quote">gssl</em></dt>
+     <dt><em>gssl</em></dt>
      <dd>
       A thin layer over the third-party TLS libraries.
      </dd>
-     <dt><em class="quote">gnet</em></dt>
+     <dt><em>gnet</em></dt>
      <dd>
       Network and event-loop classes.
      </dd>
-     <dt><em class="quote">gauth</em></dt>
+     <dt><em>gauth</em></dt>
      <dd>
       Implements various authentication mechanisms.
      </dd>
-     <dt><em class="quote">gsmtp</em></dt>
+     <dt><em>gsmtp</em></dt>
      <dd>
       SMTP protocol and message-store classes.
      </dd>
-     <dt><em class="quote">gpop</em></dt>
+     <dt><em>gpop</em></dt>
      <dd>
       POP3 protocol classes.
      </dd>
@ -124,45 +134,46 @@
    </p>

    <p>
-     Under Windows there is an additional library <em class="quote">win32</em> for the user interface.
+     Under Windows there is an additional library under <em>src/win32</em> for the user
+     interface implemented using the Microsoft Win32 API.
    </p>
   <h2><a class="a-header" name="SH_1_6">SMTP class structure</a></h2> <!-- index:2:SH:1:6:SMTP class structure -->
    <p>
-     The message-store functionality uses three abstract interfaces: <em class="quote">MessageStore</em>,
-     <em class="quote">NewMessage</em> and <em class="quote">StoredMessage</em>. The <em class="quote">NewMessage</em> interface is used to create
-     messages within the store, and the <em class="quote">StoredMessage</em> interface is used for
+     The message-store functionality uses three abstract interfaces: <em>MessageStore</em>,
+     <em>NewMessage</em> and <em>StoredMessage</em>. The <em>NewMessage</em> interface is used to create
+     messages within the store, and the <em>StoredMessage</em> interface is used for
     reading and extracting messages from the store. The concrete implementation
-     classes based on these interfaces are respectively <em class="quote">FileStore</em>, <em class="quote">NewFile</em> and
-     <em class="quote">StoredFile</em>.
+     classes based on these interfaces are respectively <em>FileStore</em>, <em>NewFile</em> and
+     <em>StoredFile</em>.
    </p>

    <p>
-     Protocol classes such as <em class="quote">GSmtp::ServerProtocol</em> receive network and timer
-     events from their container and use an abstract <em class="quote">Sender</em> interface to send
+     Protocol classes such as <em>GSmtp::ServerProtocol</em> receive network and timer
+     events from their container and use an abstract <em>Sender</em> interface to send
     network data. This means that the protocols can be independent of the network
     and event loop framework.
    </p>

    <p>
     The interaction between the SMTP server protocol class and the message store is
-     mediated by the <em class="quote">ProtocolMessage</em> interface. Two main implementations of this
-     interface are available: one for normal spooling (<em class="quote">ProtocolMessageStore</em>), and
-     another for immediate forwarding (<em class="quote">ProtocolMessageForward</em>). The <em class="quote">Decorator</em>
+     mediated by the <em>ProtocolMessage</em> interface. Two main implementations of this
+     interface are available: one for normal spooling (<em>ProtocolMessageStore</em>), and
+     another for immediate forwarding (<em>ProtocolMessageForward</em>). The <em>Decorator</em>
     pattern is used whereby the forwarding class uses an instance of the storage
     class to do the message storing and filtering, while adding in an instance
-     of the <em class="quote">GSmtp::Client</em> class to do the forwarding.
+     of the <em>GSmtp::Client</em> class to do the forwarding.
    </p>

    <p>
-     Message filtering (<em class="quote">--filter</em>) is implemented via an abstract <em class="quote">Filter</em>
+     Message filtering (<em>--filter</em>) is implemented via an abstract <em>Filter</em>
     interface. Concrete implementations are provided for doing nothing, running an
     external executable program and talking to an external network server.
    </p>

    <p>
     The protocol, processor and message-store interfaces are brought together by the
-     high-level <em class="quote">GSmtp::Server</em> and <em class="quote">GSmtp::Client</em> classes. Dependency injection is
-     used to create the concrete instances of the <em class="quote">ProtocolMessage</em> and <em class="quote">Filter</em>
+     high-level <em>GSmtp::Server</em> and <em>GSmtp::Client</em> classes. Dependency injection is
+     used to create the concrete instances of the <em>ProtocolMessage</em> and <em>Filter</em>
     interfaces.
    </p>
   <h2><a class="a-header" name="SH_1_7">Event handling and exceptions</a></h2> <!-- index:2:SH:1:7:Event handling and exceptions -->
@ -176,60 +187,52 @@
    </p>

    <p>
-     The event loop delivers asynchronous socket events to the <em class="quote">EventHandler</em>
-     interface, timer events to the <em class="quote">TimerBase</em> interface, and 'future' events to the
-     <em class="quote">FutureEventCallback</em> interface. If any of the these event handlers throws an
-     exception then the event loop will catch it and deliver it back to an exception
-     handler through the <em class="quote">onException()</em> method of an associated <em class="quote">ExceptionHandler</em>
+     The event loop delivers asynchronous socket events to the <em>EventHandler</em>
+     interface, timer events to the <em>TimerBase</em> interface, and 'future' events to the
+     <em>FutureEventCallback</em> interface. If any of the these event handlers throws an
+     exception then the event loop catches it and delivers it back to an exception
+     handler through the <em>onException()</em> method of an associated <em>ExceptionHandler</em>
     interface. If an exception is thrown out of _this_ callback then the event loop
-     code lets it propagate back to <em class="quote">main()</em>, typically terminating the program.
+     code lets it propagate back to <em>main()</em>, typically terminating the program.
    </p>

    <p>
-     Every pointer to an event callback interface is associated with an
-     <em class="quote">ExceptionHandler</em>. The default <em class="quote">ExceptionHandler</em> is the <em class="quote">EventLoop</em>
-     singleton, and a call to its <em class="quote">onException()</em> method terminates the event loop.
+     However, sometimes there are objects that need to be more resilient to
+     exceptions. In particular, a network server should not terminate just because
+     one of its connections fails unexpectedly. In these cases the owning parent
+     object receives the exception notification together with a pointer that
+     identifies the child object that threw the exception (ie. the exception
+     source). This allows the parent object to absorb the exception and delete the
+     child, without the exception killing the whole server.
    </p>

    <p>
-     This leads to a programming model where key objects are instantiated on the
-     heap and these objects delete themselves when they receive certain events from
-     the event loop. In the <em class="quote">GNet</em> library it is the <em class="quote">ServerPeer</em> and <em class="quote">HeapClient</em>
-     classes that do this lifetime management; instances of these classes delete
-     themselves when the associated network connection goes away and they
-     implement the <em class="quote">ExceptionHandler</em> interface so that they schedule their own
-     deletion when an exception is thrown.
-    </p>
-
-    <p>
-     Special smart pointers are sometimes used for these self-deleting classes; the
-     smart pointer does not delete the contained object when it is reset, it just
-     tells the object to delete itself with a zero-length timer and then releases it
-     for garbage collection.
+     The combination of an exception handler and the optional exception source
+     pointer bound to it is known as an <em>ExceptionSink</em>.
    </p>
   <h2><a class="a-header" name="SH_1_8">Multi-threading</a></h2> <!-- index:2:SH:1:8:Multi-threading -->
    <p>
     Multi-threading can be used as a build-time option to make DNS lookup and the
     execution of helper programs asynchronous; if std::thread is available then it
-     is used in a future/promise pattern to wrap up <em class="quote">getaddrinfo()</em> and <em class="quote">waitpid()</em>
+     is used in a future/promise pattern to wrap up <em>getaddrinfo()</em> and <em>waitpid()</em>
     system calls. The shared state comprises only the parameters and return results
     from these system calls, and synchronisation back to the main thread uses the
-     event loop (see <em class="quote">GNet::FutureEvent</em>).
+     event loop (see <em>GNet::FutureEvent</em>).
    </p>
   <h2><a class="a-header" name="SH_1_9">E-MailRelay GUI</a></h2> <!-- index:2:SH:1:9:E-MailRelay GUI -->
    <p>
-     The optional GUI program <em class="quote">emailrelay-gui</em> uses the Qt toolkit for its user
+     The optional GUI program <em>emailrelay-gui</em> uses the Qt toolkit for its user
     interface components. The GUI can run as an installer or as a configuration
-     helper, depending on whether it can find an installation <em class="quote">payload</em>. Refer to
-     the comments in <em class="quote">src/gui/guimain.cpp</em> for more details.
+     helper, depending on whether it can find an installation <em>payload</em>. Refer to
+     the comments in <em>src/gui/guimain.cpp</em> for more details.
    </p>

    <p>
     The user interface runs as a stack of dialog-box pages with forward and back
     buttons at the bottom. Once the stack has been completed by the user then each
     page is asked to dump out its state as a set of key-value pairs (see
-     <em class="quote">src/gui/pages.cpp</em>). These key-value pairs are processed by an installer class
-     into a list of action objects (in the <em class="quote">Command</em> design pattern) and then the
+     <em>src/gui/pages.cpp</em>). These key-value pairs are processed by an installer class
+     into a list of action objects (in the <em>Command</em> design pattern) and then the
     action objects are run in turn. In order to display the progress of the
     installation each action object is run within a timer callback so that the Qt
     framework gets a chance to update the display between each one.
@ -243,8 +246,8 @@

    <p>
     When run in configure mode the GUI normally ends up simply editing the
-     <em class="quote">emailrelay.conf</em> file (or <em class="quote">emailrelay-start.bat</em> on Windows) and/or the
-     <em class="quote">emailrelay.auth</em> secrets file.
+     <em>emailrelay.conf</em> file (or <em>emailrelay-start.bat</em> on Windows) and/or the
+     <em>emailrelay.auth</em> secrets file.
    </p>

    <p>
@ -257,29 +260,29 @@
   <h2><a class="a-header" name="SH_1_10">Windows packaging</a></h2> <!-- index:2:SH:1:10:Windows packaging -->
    <p>
     On Windows E-MailRelay is packaged as a zip file containing the executables
-     (including the emailrelay GUI as <em class="quote">emailrelay-setup.exe</em>), documentation, and a
-     <em class="quote">payload</em> directory tree. The payload contains many of the same files all over
+     (including the emailrelay GUI as <em>emailrelay-setup.exe</em>), documentation, and a
+     <em>payload</em> directory tree. The payload contains many of the same files all over
     again, and while this duplication is not ideal it is at least straightforward.
    </p>

    <p>
-     The Qt tool <em class="quote">windeployqt</em> is used to add run-time dependencies, such as the
+     The Qt tool <em>windeployqt</em> is used to add run-time dependencies, such as the
     Qt DLLs.
    </p>
   <h2><a class="a-header" name="SH_1_11">Unix packaging</a></h2> <!-- index:2:SH:1:11:Unix packaging -->
    <p>
     On Unix-like operating systems it is more natural to use some sort of package
-     derived from the <em class="quote">make install</em> process rather than an installer program, so
+     derived from the <em>make install</em> process rather than an installer program, so
     the emailrelay GUI is not normally used.
    </p>

    <p>
-     Top-level makefile targets <em class="quote">dist</em>, <em class="quote">deb</em> and <em class="quote">rpm</em> can be used to create a
+     Top-level makefile targets <em>dist</em>, <em>deb</em> and <em>rpm</em> can be used to create a
     binary tarball, a debian package, and an RPM package respectively.
    </p>
   <h2><a class="a-header" name="SH_1_12">Source control</a></h2> <!-- index:2:SH:1:12:Source control -->
    <p>
-     The source code is stored in the SourceForge <em class="quote">svn</em> repository. A working
+     The source code is stored in the SourceForge <em>svn</em> repository. A working
     copy can be checked out as follows:
    </p>

@ -288,29 +291,29 @@
      </div><!-- div-pre -->
   <h2><a class="a-header" name="SH_1_13">Compile-time features</a></h2> <!-- index:2:SH:1:13:Compile-time features -->
    <p>
-     Compile-time features can be selected with options passed to the <em class="quote">configure</em>
+     Compile-time features can be selected with options passed to the <em>configure</em>
     script. These include the following:
    </p>

    <ul>
-     <li>Debug-level logging (<em class="quote">--enable-debug</em>)</li>
-     <li>Configuration GUI (<em class="quote">--enable-gui</em>)</li>
-     <li>PAM support (<em class="quote">--with-pam</em>)</li>
+     <li>Debug-level logging (<em>--enable-debug</em>)</li>
+     <li>Configuration GUI (<em>--enable-gui</em>)</li>
+     <li>PAM support (<em>--with-pam</em>)</li>
    </ul>

    <p>
-     Use <em class="quote">./configure --help</em> to see a complete list of options and refer to
-     <em class="quote">acinclude.m4</em> for more detailed comments.
+     Use <em>./configure --help</em> to see a complete list of options and refer to
+     <em>acinclude.m4</em> for more detailed comments.
    </p>



    <div class="div-footer">
     <p>
-      Copyright (C) 2001-2018 Graeme Walker
+      Copyright (C) 2001-2019 Graeme Walker
     </p>
    </div><!-- div-footer -->
 </div> <!-- div-main -->
 </body>
 </html>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/developer.md
+++ b/doc/developer.md
@ -14,7 +14,7 @@ Dependencies
 ------------
 E-MailRelay started life at a time when Linux had no decent package manager and
 Windows was in the grip of DLL hell. As a result, a key principle is that it
-has no dependencies other than a decent C++ runtime. Since that time OpenSSL
+has no dependencies other than a good C++ runtime. Since that time OpenSSL
 has been introduced as a dependency to support [TLS][] encryption, and the optional
 configuration and installation GUI has been developed using the Qt toolkit.

@ -64,6 +64,14 @@ slot/signal implementation has been simplified compared to Qt or boost by not
 supporting signal multicasting, so each signal connects to no more than one
 slot.

+The synchronous slot/signal pattern needs some care when when the signalling
+object gets destructed as a side-effect of raising a signal, and that situation
+can be non-obvious precisely because of the slot/signal code decoupling. In
+most cases signals are emitted at the end of a function and the stack unwinds
+back to the event loop immediately afterwards, but in other situations,
+particularly when emitting more than one signal, defensive measures are
+required.
+
 Module structure
 ----------------
 The main C++ libraries in the E-MailRelay code base are as follows:
@ -95,7 +103,8 @@ The main C++ libraries in the E-MailRelay code base are as follows:

 All of these libraries are portable between Unix-like systems and Windows.

-Under Windows there is an additional library `win32` for the user interface.
+Under Windows there is an additional library under `src/win32` for the user
+interface implemented using the Microsoft Win32 API.

 SMTP class structure
 --------------------
@ -140,27 +149,21 @@ high-level feature.
 The event loop delivers asynchronous socket events to the `EventHandler`
 interface, timer events to the `TimerBase` interface, and 'future' events to the
 `FutureEventCallback` interface. If any of the these event handlers throws an
-exception then the event loop will catch it and deliver it back to an exception
+exception then the event loop catches it and delivers it back to an exception
 handler through the `onException()` method of an associated `ExceptionHandler`
 interface. If an exception is thrown out of _this_ callback then the event loop
 code lets it propagate back to `main()`, typically terminating the program.

-Every pointer to an event callback interface is associated with an
-`ExceptionHandler`. The default `ExceptionHandler` is the `EventLoop`
-singleton, and a call to its `onException()` method terminates the event loop.
+However, sometimes there are objects that need to be more resilient to
+exceptions. In particular, a network server should not terminate just because
+one of its connections fails unexpectedly. In these cases the owning parent
+object receives the exception notification together with a pointer that
+identifies the child object that threw the exception (ie. the exception
+source). This allows the parent object to absorb the exception and delete the
+child, without the exception killing the whole server.

-This leads to a programming model where key objects are instantiated on the
-heap and these objects delete themselves when they receive certain events from
-the event loop. In the `GNet` library it is the `ServerPeer` and `HeapClient`
-classes that do this lifetime management; instances of these classes delete
-themselves when the associated network connection goes away and they
-implement the `ExceptionHandler` interface so that they schedule their own
-deletion when an exception is thrown.
-
-Special smart pointers are sometimes used for these self-deleting classes; the
-smart pointer does not delete the contained object when it is reset, it just
-tells the object to delete itself with a zero-length timer and then releases it
-for garbage collection.
+The combination of an exception handler and the optional exception source
+pointer bound to it is known as an `ExceptionSink`.

 Multi-threading
 ---------------
@ -247,4 +250,4 @@ Use `./configure --help` to see a complete list of options and refer to
 [TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security

 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/developer.rst
+++ b/doc/developer.rst
@ -15,7 +15,7 @@ Dependencies
 ============
 E-MailRelay started life at a time when Linux had no decent package manager and
 Windows was in the grip of DLL hell. As a result, a key principle is that it
-has no dependencies other than a decent C++ runtime. Since that time OpenSSL
+has no dependencies other than a good C++ runtime. Since that time OpenSSL
 has been introduced as a dependency to support TLS_ encryption, and the optional
 configuration and installation GUI has been developed using the Qt toolkit.

@ -65,6 +65,14 @@ slot/signal implementation has been simplified compared to Qt or boost by not
 supporting signal multicasting, so each signal connects to no more than one
 slot.

+The synchronous slot/signal pattern needs some care when when the signalling
+object gets destructed as a side-effect of raising a signal, and that situation
+can be non-obvious precisely because of the slot/signal code decoupling. In
+most cases signals are emitted at the end of a function and the stack unwinds
+back to the event loop immediately afterwards, but in other situations,
+particularly when emitting more than one signal, defensive measures are
+required.
+
 Module structure
 ================
 The main C++ libraries in the E-MailRelay code base are as follows:
@ -96,7 +104,8 @@ The main C++ libraries in the E-MailRelay code base are as follows:

 All of these libraries are portable between Unix-like systems and Windows.

-Under Windows there is an additional library *win32* for the user interface.
+Under Windows there is an additional library under *src/win32* for the user
+interface implemented using the Microsoft Win32 API.

 SMTP class structure
 ====================
@ -141,27 +150,21 @@ high-level feature.
 The event loop delivers asynchronous socket events to the *EventHandler*
 interface, timer events to the *TimerBase* interface, and 'future' events to the
 *FutureEventCallback* interface. If any of the these event handlers throws an
-exception then the event loop will catch it and deliver it back to an exception
+exception then the event loop catches it and delivers it back to an exception
 handler through the *onException()* method of an associated *ExceptionHandler*
 interface. If an exception is thrown out of _this_ callback then the event loop
 code lets it propagate back to *main()*, typically terminating the program.

-Every pointer to an event callback interface is associated with an
-\ *ExceptionHandler*\ . The default *ExceptionHandler* is the *EventLoop*
-singleton, and a call to its *onException()* method terminates the event loop.
+However, sometimes there are objects that need to be more resilient to
+exceptions. In particular, a network server should not terminate just because
+one of its connections fails unexpectedly. In these cases the owning parent
+object receives the exception notification together with a pointer that
+identifies the child object that threw the exception (ie. the exception
+source). This allows the parent object to absorb the exception and delete the
+child, without the exception killing the whole server.

-This leads to a programming model where key objects are instantiated on the
-heap and these objects delete themselves when they receive certain events from
-the event loop. In the *GNet* library it is the *ServerPeer* and *HeapClient*
-classes that do this lifetime management; instances of these classes delete
-themselves when the associated network connection goes away and they
-implement the *ExceptionHandler* interface so that they schedule their own
-deletion when an exception is thrown.
-
-Special smart pointers are sometimes used for these self-deleting classes; the
-smart pointer does not delete the contained object when it is reset, it just
-tells the object to delete itself with a zero-length timer and then releases it
-for garbage collection.
+The combination of an exception handler and the optional exception source
+pointer bound to it is known as an *ExceptionSink*.

 Multi-threading
 ===============
@ -250,4 +253,4 @@ Use *./configure --help* to see a complete list of options and refer to
 .. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
 .. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security

-.. footer:: Copyright (C) 2001-2018 Graeme Walker
+.. footer:: Copyright (C) 2001-2019 Graeme Walker
--- a/doc/developer.txt
+++ b/doc/developer.txt
@ -13,7 +13,7 @@ Dependencies
 ------------
 E-MailRelay started life at a time when Linux had no decent package manager and
 Windows was in the grip of DLL hell. As a result, a key principle is that it
-has no dependencies other than a decent C++ runtime. Since that time OpenSSL
+has no dependencies other than a good C++ runtime. Since that time OpenSSL
 has been introduced as a dependency to support TLS encryption, and the optional
 configuration and installation GUI has been developed using the Qt toolkit.

@ -63,6 +63,14 @@ slot/signal implementation has been simplified compared to Qt or boost by not
 supporting signal multicasting, so each signal connects to no more than one
 slot.

+The synchronous slot/signal pattern needs some care when when the signalling
+object gets destructed as a side-effect of raising a signal, and that situation
+can be non-obvious precisely because of the slot/signal code decoupling. In
+most cases signals are emitted at the end of a function and the stack unwinds
+back to the event loop immediately afterwards, but in other situations,
+particularly when emitting more than one signal, defensive measures are
+required.
+
 Module structure
 ----------------
 The main C++ libraries in the E-MailRelay code base are as follows:
@ -88,7 +96,8 @@ The main C++ libraries in the E-MailRelay code base are as follows:

 All of these libraries are portable between Unix-like systems and Windows.

-Under Windows there is an additional library "win32" for the user interface.
+Under Windows there is an additional library under "src/win32" for the user
+interface implemented using the Microsoft Win32 API.

 SMTP class structure
 --------------------
@ -133,27 +142,21 @@ high-level feature.
 The event loop delivers asynchronous socket events to the "EventHandler"
 interface, timer events to the "TimerBase" interface, and 'future' events to the
 "FutureEventCallback" interface. If any of the these event handlers throws an
-exception then the event loop will catch it and deliver it back to an exception
+exception then the event loop catches it and delivers it back to an exception
 handler through the "onException()" method of an associated "ExceptionHandler"
 interface. If an exception is thrown out of _this_ callback then the event loop
 code lets it propagate back to "main()", typically terminating the program.

-Every pointer to an event callback interface is associated with an
-"ExceptionHandler". The default "ExceptionHandler" is the "EventLoop"
-singleton, and a call to its "onException()" method terminates the event loop.
+However, sometimes there are objects that need to be more resilient to
+exceptions. In particular, a network server should not terminate just because
+one of its connections fails unexpectedly. In these cases the owning parent
+object receives the exception notification together with a pointer that
+identifies the child object that threw the exception (ie. the exception
+source). This allows the parent object to absorb the exception and delete the
+child, without the exception killing the whole server.

-This leads to a programming model where key objects are instantiated on the
-heap and these objects delete themselves when they receive certain events from
-the event loop. In the "GNet" library it is the "ServerPeer" and "HeapClient"
-classes that do this lifetime management; instances of these classes delete
-themselves when the associated network connection goes away and they
-implement the "ExceptionHandler" interface so that they schedule their own
-deletion when an exception is thrown.
-
-Special smart pointers are sometimes used for these self-deleting classes; the
-smart pointer does not delete the contained object when it is reset, it just
-tells the object to delete itself with a zero-length timer and then releases it
-for garbage collection.
+The combination of an exception handler and the optional exception source
+pointer bound to it is known as an "ExceptionSink".

 Multi-threading
 ---------------
@ -235,4 +238,4 @@ Use "./configure --help" to see a complete list of options and refer to


 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/doxygen-missing.html
+++ b/doc/doxygen-missing.html
@ -11,4 +11,4 @@
  </div>
 </body>
 </html>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@ -1,4 +1,4 @@
-# Doxyfile 1.8.14
+# Doxyfile 1.8.15

 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@ -17,10 +17,10 @@
 # Project related configuration options
 #---------------------------------------------------------------------------

-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
 # https://www.gnu.org/software/libiconv/ for the list of possible encodings.
 # The default value is: UTF-8.

@ -93,6 +93,14 @@ ALLOW_UNICODE_NAMES    = NO

 OUTPUT_LANGUAGE        = English

+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@ -238,6 +246,10 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines (in the resulting output). You can put ^^ in the value part of an
 # alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})

 ALIASES                =

@ -275,17 +287,26 @@ OPTIMIZE_FOR_FORTRAN   = NO

 OPTIMIZE_OUTPUT_VHDL   = NO

+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is
+# Fortran), use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@ -296,7 +317,7 @@ EXTENSION_MAPPING      =

 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@ -754,7 +775,8 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
 # The default value is: NO.

 WARN_NO_PARAMDOC       = NO
@ -814,7 +836,7 @@ INPUT_ENCODING         = UTF-8
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
 # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.

 FILE_PATTERNS          = *.c \
                         *.cc \
@ -859,7 +881,8 @@ FILE_PATTERNS          = *.c \
                         *.vhd \
                         *.vhdl \
                         *.ucf \
-                         *.qsf
+                         *.qsf \
+                         *.ice

 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@ -1012,7 +1035,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS = NO

 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
+# entity all documented functions referencing it will be listed.
 # The default value is: NO.

 REFERENCED_BY_RELATION = NO
@ -1049,7 +1072,7 @@ SOURCE_TOOLTIPS        = YES
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@ -1104,7 +1127,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.

-GENERATE_HTML          = YES
+GENERATE_HTML = YES

 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@ -1259,13 +1282,13 @@ HTML_INDEX_NUM_ENTRIES = 100

 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
 # Makefile in the HTML output directory. Running make will produce the docset in
 # that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.

@ -1304,7 +1327,7 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
 # Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
@ -1380,7 +1403,7 @@ QCH_FILE               =

 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.

@ -1388,7 +1411,8 @@ QHP_NAMESPACE          = org.doxygen.Project

 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.

@ -1396,21 +1420,23 @@ QHP_VIRTUAL_FOLDER     = doc

 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.

 QHP_CUST_FILTER_NAME   =

 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.

 QHP_CUST_FILTER_ATTRS  =

 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.

 QHP_SECT_FILTER_ATTRS  =
@ -1543,10 +1569,10 @@ MATHJAX_FORMAT         = HTML-CSS
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
 # MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
 # This tag requires that the tag USE_MATHJAX is set to YES.

-MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/

 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
@ -1669,21 +1695,34 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

-LATEX_CMD_NAME         = latex
+LATEX_CMD_NAME         =

 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.

 MAKEINDEX_CMD_NAME     = makeindex

+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: \makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = \makeindex
+
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@ -1818,6 +1857,14 @@ LATEX_BIB_STYLE        = plain

 LATEX_TIMESTAMP        = NO

+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@ -1857,9 +1904,9 @@ COMPACT_RTF            = NO

 RTF_HYPERLINKS         = NO

-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@ -1868,8 +1915,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =

 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.

 RTF_EXTENSIONS_FILE    =
@ -1955,6 +2002,13 @@ XML_OUTPUT             = xml

 XML_PROGRAMLISTING     = YES

+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@ -2089,7 +2143,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

-PREDEFINED = G_EXCEPTION()= GCONFIG_HAVE_LIBPNG=1 __cplusplus=201400 G_UNIX=1 GCONFIG_ENABLE_STD_THREAD=1 GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED=1 GCONFIG_HAVE_CXX_SHARED_PTR=1
+PREDEFINED = G_DOXYGEN=1 G_UNIX=1 __cplusplus=201400 G_EXCEPTION()= G_EXCEPTION_CLASS()= G_CONSTANT()= g__enum(x)="enum x" g__enum_end=";" __declspec__(x)= __attribute__(x)=

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
--- a/doc/emailrelay-doxygen.css
+++ b/doc/emailrelay-doxygen.css
@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+  Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 */

 /*
--- a/doc/emailrelay-filter-copy.1
+++ b/doc/emailrelay-filter-copy.1
@ -1,4 +1,4 @@
-.\" Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\"
 .\" 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
@ -20,6 +20,10 @@ emailrelay-filter-copy \- an emailrelay filter program for pop-by-name
 .I <emailrelay-content-file>
 .LP
 .B emailrelay-filter-copy
+-d
+.I <spool-directory>
+.LP
+.B emailrelay-filter-copy
 [--help]
 .SH DESCRIPTION
 The
@ -39,6 +43,11 @@ the main directory. If the envelope is successfully copied to
 one or more sub-directories then it is removed from the main
 spool directory and it will therefore not be available for SMTP
 forwarding.
+.LP
+When using
+.I "-d"
+all envelope files in the spool directory are copied to all
+sub-directories.
 .SH SEE ALSO
 .BR emailrelay (1),
 .SH AUTHOR
--- a/doc/emailrelay-man.html
+++ b/doc/emailrelay-man.html
@ -1,6 +1,5 @@

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of EMAILRELAY</TITLE>
+<HTML><HEAD><TITLE>Manpage of EMAILRELAY</TITLE>
 </HEAD><BODY>
 <H1>EMAILRELAY</H1>
 Section: User Commands  (1)<BR>Updated: local<BR><A HREF="#index">Index</A>
@ -100,10 +99,14 @@ This is equivalent to <I>--log</I> and <I>--close-stderr</I>. It is a convenient

 <DD>
 Enables SMTP client authentication with the remote server, using the client account details taken from the specified secrets file. The secrets file should normally contain one line that starts with <I>client</I> and that line should have between four and five space-separated fields; the second field is the password encoding (<I>plain</I> or <I>md5</I>), the third is the user-id and the fourth is the password. The user-id is RFC-1891 xtext encoded, and the password is either xtext encoded or generated by <I>emailrelay-passwd</I>. If the remote server does not support SMTP authentication then the SMTP connection will fail.
+<DT><B>--client-auth-config </B><I>&lt;config&gt;</I>
+
+<DD>
+Configures the SMTP client authentication module using a  semicolon-separated list of configuration items. Each item is a  single-character key, followed by a colon and then a comma-separated  list. A 'm' character introduces an ordered list of authentication  mechanisms, and an 'x' is used for blocklisted mechanisms.
 <DT><B>-Y, --client-filter </B><I>&lt;program&gt;</I>

 <DD>
-Runs the specified external filter program whenever a mail message is forwarded. The filter is passed the name of the message file in the spool directory so that it can edit it as required. A network filter can be specified as <I>net:&lt;transport-address&gt;</I> and prefixes of <I>spam:</I> and <I>exit:</I> are also allowed. The <I>--filter</I> option is normally more useful than <I>--client-filter</I>.
+Runs the specified external filter program whenever a mail message is forwarded. The filter is passed the name of the message file in the spool directory so that it can edit it as required. A network filter can be specified as <I>net:&lt;transport-address&gt;</I> and prefixes of <I>spam:</I>, <I>spam-edit:</I> and <I>exit:</I> are also allowed. The <I>--filter</I> option is normally more useful than <I>--client-filter</I>.
 <DT><B>-6, --client-interface </B><I>&lt;ip-address&gt;</I>

 <DD>
@ -148,10 +151,14 @@ Specifies a timeout (in seconds) for establishing a TCP connection to remote SMT

 <DD>
 Enables debug level logging, if built in. Debug messages are usually only useful when cross-referenced with the source code and they may expose plaintext passwords and mail message content.
+<DT><B>--dnsbl </B><I>&lt;config&gt;</I>
+
+<DD>
+Specifies a list of DNSBL servers that are used to reject SMTP  connections from blocked addresses. The configuration string is made up of comma-separated fields: the DNS server's transport address, a timeout in milliseconds, a rejection threshold, and then the list of DNSBL servers.
 <DT><B>-D, --domain </B><I>&lt;fqdn&gt;</I>

 <DD>
-Specifies the network name that is used in SMTP EHLO commands, <I>Received</I> lines, and for generating authentication challenges. The default network name it derived from a DNS lookup of the local hostname.
+Specifies the network name that is used in SMTP EHLO commands, <I>Received</I> lines, and for generating authentication challenges. The default is derived from a DNS lookup of the local hostname.
 <DT><B>-x, --dont-serve</B>

 <DD>
@ -159,7 +166,7 @@ Disables all network serving, including SMTP, POP and administration interfaces.
 <DT><B>-z, --filter </B><I>&lt;program&gt;</I>

 <DD>
-Runs the specified external filter program whenever a mail message is stored. The filter is passed the name of the message file in the spool directory so that it can edit it as required. The mail message is rejected if the filter program terminates with an exit code between 1 and 99. Use <I>net:&lt;transport-address&gt;</I> to communicate with a filter daemon over the network, or <I>spam:&lt;transport-address&gt;</I> to talk to a spamassassin spamd daemon, or <I>exit:&lt;number&gt;</I> to emulate a filter program that just exits.
+Runs the specified external filter program whenever a mail message is stored. The filter is passed the name of the message file in the spool directory so that it can edit it as required. The mail message is rejected if the filter program terminates with an exit code between 1 and 99. Use <I>net:&lt;transport-address&gt;</I> to communicate with a filter daemon over the network, or <I>spam:&lt;transport-address&gt;</I> for a spamassassin spamd daemon to accept or reject mail messages, or  <I>spam-edit:&lt;transport-address&gt;</I> to have spamassassin edit the message  content without rejecting it, or <I>exit:&lt;number&gt;</I> to emulate a filter  program that just exits.
 <DT><B>-W, --filter-timeout </B><I>&lt;time&gt;</I>

 <DD>
@ -184,10 +191,14 @@ Displays help text and then exits. Use with <I>--verbose</I> for more complete o

 <DD>
 Windows only. Hides the application window and disables all message boxes. This is useful when running as a windows service.
+<DT><B>--idle-timeout </B><I>&lt;time&gt;</I>
+
+<DD>
+Specifies a timeout (in seconds) for receiving network traffic from  remote SMTP and POP clients. The default is 1800 seconds.
 <DT><B>-m, --immediate</B>

 <DD>
-Causes mail messages to be forwarded as soon as they are submitted, even before they are accepted. This can be used to do proxying without store-and-forward, but in practice clients tend to to time out while waiting for their mail message to be accepted.
+Causes mail messages to be forwarded as they are received, even before  they have been accepted. This can be used to do proxying without  store-and-forward, but in practice clients tend to to time out while waiting for their mail message to be accepted.
 <DT><B>-I, --interface </B><I>&lt;ip-address-list&gt;</I>

 <DD>
@ -227,7 +238,7 @@ Causes forwarding of spooled mail messages to happen at regular intervals (with
 <DT><B>-B, --pop</B>

 <DD>
-Enables the POP server listening, by default on port 110, providing access to spooled mail messages. Negotiated TLS using the POP3 <I>STLS</I> command will be enabled if the <I>--server-tls</I> option is also given.
+Enables the POP server listening, by default on port 110, providing access to spooled mail messages. Negotiated TLS using the POP <I>STLS</I> command will be enabled if the <I>--server-tls</I> option is also given.
 <DT><B>-F, --pop-auth </B><I>&lt;file&gt;</I>

 <DD>
@ -235,7 +246,7 @@ Specifies a file containing valid POP account details. The file format is the sa
 <DT><B>-J, --pop-by-name</B>

 <DD>
-Modifies the spool directory used by the POP server to be a sub-directory with the same name as the POP authentication user-id. This allows multiple POP clients to read the spooled messages without interfering with each other. Content files can stay in the main spool directory with the envelope files copied into user-specific sub-directories. The <I>emailrelay-filter-copy</I> program is a convenient way of doing this when run via <I>--filter</I>.
+Modifies the spool directory used by the POP server to be a sub-directory with the same name as the POP authentication user-id. This allows multiple POP clients to read the spooled messages without interfering with each other, particularly when also  using <I>--pop-no-delete</I>. Content files can stay in the main spool  directory with only the envelope files copied into user-specific  sub-directories. The <I>emailrelay-filter-copy</I> program is a  convenient way of doing this when run via <I>--filter</I>.
 <DT><B>-G, --pop-no-delete</B>

 <DD>
@ -264,6 +275,10 @@ Specifies a timeout (in seconds) for getting responses from remote SMTP servers.

 <DD>
 Enables SMTP server authentication of remote SMTP clients. Account names and passwords are taken from the specified secrets file. The secrets file should contain lines that have four space-separated fields, starting with <I>server</I> in the first field; the second field is the password encoding (<I>plain</I> or <I>md5</I>), the third is the client user-id and the fourth is the password. The user-id is RFC-1891 xtext encoded, and the password is either xtext encoded or generated by <I>emailrelay-passwd</I>. A special value of <I>/pam</I> can be used for authentication using linux PAM.
+<DT><B>--server-auth-config </B><I>&lt;config&gt;</I>
+
+<DD>
+Configures the SMTP server authentication module using a  semicolon-separated list of configuration items. Each item is a  single-character key, followed by a colon and then a comma-separated  list. A 'm' character introduces a preferred sub-set of the built-in  authentication mechanisms, and an 'x' is used for blocklisted  mechanisms.
 <DT><B>-K, --server-tls</B>

 <DD>
@ -299,7 +314,7 @@ Selects and configures the low-level TLS library, using a comma-separated list o
 <DT><B>-u, --user </B><I>&lt;username&gt;</I>

 <DD>
-When started as root the program switches to an non-privileged effective user-id when idle. This option can be used to define which user-id is used. Ignored on Windows.
+When started as root the program switches to an non-privileged effective user-id when idle. This option can be used to define which user-id is used. Specify <I>root</I> to disable all user-id switching. Ignored on Windows.
 <DT><B>-v, --verbose</B>

 <DD>
@ -338,4 +353,4 @@ This document was created by
 using the manual pages.<BR>
 </BODY>
 </HTML>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/emailrelay-passwd.1
+++ b/doc/emailrelay-passwd.1
@ -1,4 +1,4 @@
-.\" Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\"
 .\" 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
@ -21,7 +21,7 @@ emailrelay-passwd \- a password encoding utility for emailrelay
 .I emailrelay-passwd
 is a utility which reads a single plaintext password from the standard
 input, and writes out an encoded form onto the standard
-output. The encoded form is suitable for pasting into a CRAM-MD5
+output. The encoded form is suitable for pasting into a "md5"
 line in an
 .B emailrelay
 secrets file.
@ -38,11 +38,25 @@ this:
 server md5 alice Oqng9/H7wAyKgbuqw5VzG1bNO6feqtblyiNEi6QuN5dH
 .br
 server md5 bob Ot6SDdGj23eWjdEuKICgN8Nj9z/Vx9IV3ISz9VvmnaUB
-.br
+.SH OPTIONS
+.TP
+.B \-b, --base64
+Interpret the input password as base64 encoded.
+.TP
+.B \-d, --dotted
+Generate a dotted decimal format, for backwards compatibility.
+.TP
+.B \-H, --hash \fI<function>\fR
+Specifies the hash function, such as MD5 or SHA1. MD5 is the default, and a hash function of NONE does simple xtext encoding. Other hash function may or may not be available, depending on the build.
+.TP
+.B \-h, --help
+Shows help and exits.
+.TP
+.B \-p, --password \fI<pwd>\fR
+Specifies the password to be hashed. Beware of leaking sensitive passwords via command-line history or the process-table when using this option.
 .SH SEE ALSO
 .BR emailrelay (1),
 .BR emailrelay-submit (1),
-.BR emailrelay-poke (1)
 .br
 .B RFC-2104
 .br
--- a/doc/emailrelay-submit.1
+++ b/doc/emailrelay-submit.1
@ -1,4 +1,4 @@
-.\" Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\"
 .\" 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
--- a/doc/emailrelay.1
+++ b/doc/emailrelay.1
@ -1,4 +1,4 @@
-.\" Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+.\" Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 .\"
 .\" 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
@ -76,8 +76,11 @@ This is equivalent to \fI--log\fR and \fI--close-stderr\fR. It is a convenient w
 .B \-C, --client-auth \fI<file>\fR
 Enables SMTP client authentication with the remote server, using the client account details taken from the specified secrets file. The secrets file should normally contain one line that starts with \fIclient\fR and that line should have between four and five space-separated fields; the second field is the password encoding (\fIplain\fR or \fImd5\fR), the third is the user-id and the fourth is the password. The user-id is RFC-1891 xtext encoded, and the password is either xtext encoded or generated by \fIemailrelay-passwd\fR. If the remote server does not support SMTP authentication then the SMTP connection will fail.
 .TP
+.B --client-auth-config \fI<config>\fR
+Configures the SMTP client authentication module using a  semicolon-separated list of configuration items. Each item is a  single-character key, followed by a colon and then a comma-separated  list. A 'm' character introduces an ordered list of authentication  mechanisms, and an 'x' is used for blocklisted mechanisms.
+.TP
 .B \-Y, --client-filter \fI<program>\fR
-Runs the specified external filter program whenever a mail message is forwarded. The filter is passed the name of the message file in the spool directory so that it can edit it as required. A network filter can be specified as \fInet:<transport-address>\fR and prefixes of \fIspam:\fR and \fIexit:\fR are also allowed. The \fI--filter\fR option is normally more useful than \fI--client-filter\fR.
+Runs the specified external filter program whenever a mail message is forwarded. The filter is passed the name of the message file in the spool directory so that it can edit it as required. A network filter can be specified as \fInet:<transport-address>\fR and prefixes of \fIspam:\fR, \fIspam-edit:\fR and \fIexit:\fR are also allowed. The \fI--filter\fR option is normally more useful than \fI--client-filter\fR.
 .TP
 .B \-6, --client-interface \fI<ip-address>\fR
 Specifies the IP network address to be used to bind the local end of outgoing SMTP connections. By default the address will depend on the routing tables in the normal way. Use \fI0.0.0.0\fR to use only IPv4 addresses returned from DNS lookups of the \fI--forward-to\fR address, or \fI::\fR for IPv6.
@ -112,14 +115,17 @@ Specifies a timeout (in seconds) for establishing a TCP connection to remote SMT
 .B \-g, --debug
 Enables debug level logging, if built in. Debug messages are usually only useful when cross-referenced with the source code and they may expose plaintext passwords and mail message content.
 .TP
+.B --dnsbl \fI<config>\fR
+Specifies a list of DNSBL servers that are used to reject SMTP  connections from blocked addresses. The configuration string is made up of comma-separated fields: the DNS server's transport address, a timeout in milliseconds, a rejection threshold, and then the list of DNSBL servers.
+.TP
 .B \-D, --domain \fI<fqdn>\fR
-Specifies the network name that is used in SMTP EHLO commands, \fIReceived\fR lines, and for generating authentication challenges. The default network name it derived from a DNS lookup of the local hostname.
+Specifies the network name that is used in SMTP EHLO commands, \fIReceived\fR lines, and for generating authentication challenges. The default is derived from a DNS lookup of the local hostname.
 .TP
 .B \-x, --dont-serve
 Disables all network serving, including SMTP, POP and administration interfaces. The program will terminate as soon as any initial forwarding is complete.
 .TP
 .B \-z, --filter \fI<program>\fR
-Runs the specified external filter program whenever a mail message is stored. The filter is passed the name of the message file in the spool directory so that it can edit it as required. The mail message is rejected if the filter program terminates with an exit code between 1 and 99. Use \fInet:<transport-address>\fR to communicate with a filter daemon over the network, or \fIspam:<transport-address>\fR to talk to a spamassassin spamd daemon, or \fIexit:<number>\fR to emulate a filter program that just exits.
+Runs the specified external filter program whenever a mail message is stored. The filter is passed the name of the message file in the spool directory so that it can edit it as required. The mail message is rejected if the filter program terminates with an exit code between 1 and 99. Use \fInet:<transport-address>\fR to communicate with a filter daemon over the network, or \fIspam:<transport-address>\fR for a spamassassin spamd daemon to accept or reject mail messages, or  \fIspam-edit:<transport-address>\fR to have spamassassin edit the message  content without rejecting it, or \fIexit:<number>\fR to emulate a filter  program that just exits.
 .TP
 .B \-W, --filter-timeout \fI<time>\fR
 Specifies a timeout (in seconds) for running a \fI--filter\fR program. The default is 300 seconds.
@ -139,8 +145,11 @@ Displays help text and then exits. Use with \fI--verbose\fR for more complete ou
 .B \-H, --hidden
 Windows only. Hides the application window and disables all message boxes. This is useful when running as a windows service.
 .TP
+.B --idle-timeout \fI<time>\fR
+Specifies a timeout (in seconds) for receiving network traffic from  remote SMTP and POP clients. The default is 1800 seconds.
+.TP
 .B \-m, --immediate
-Causes mail messages to be forwarded as soon as they are submitted, even before they are accepted. This can be used to do proxying without store-and-forward, but in practice clients tend to to time out while waiting for their mail message to be accepted.
+Causes mail messages to be forwarded as they are received, even before  they have been accepted. This can be used to do proxying without  store-and-forward, but in practice clients tend to to time out while waiting for their mail message to be accepted.
 .TP
 .B \-I, --interface \fI<ip-address-list>\fR
 Specifies the IP network addresses used to bind listening ports. By default listening ports for incoming SMTP, POP and administration connections will bind the 'any' address for IPv4 and for IPv6, ie. \fI0.0.0.0\fR and \fI::\fR. Use this option to limit listening to particular addresses (and by implication to particular network interfaces). Multiple addresses can be specified by using the option more than once or by using a comma-separated list. Use a prefix of \fIsmtp=\fR, \fIpop=\fR or \fIadmin=\fR on addresses that should apply only to those types of listening port.
@ -170,13 +179,13 @@ Causes the process-id to be written into the specified file when the program sta
 Causes forwarding of spooled mail messages to happen at regular intervals (with the time given in seconds).
 .TP
 .B \-B, --pop
-Enables the POP server listening, by default on port 110, providing access to spooled mail messages. Negotiated TLS using the POP3 \fISTLS\fR command will be enabled if the \fI--server-tls\fR option is also given.
+Enables the POP server listening, by default on port 110, providing access to spooled mail messages. Negotiated TLS using the POP \fISTLS\fR command will be enabled if the \fI--server-tls\fR option is also given.
 .TP
 .B \-F, --pop-auth \fI<file>\fR
 Specifies a file containing valid POP account details. The file format is the same as for the SMTP server secrets file, ie. lines starting with \fIserver\fR, with user-id and password in the third and fourth fields. A special value of \fI/pam\fR can be used for authentication using linux PAM.
 .TP
 .B \-J, --pop-by-name
-Modifies the spool directory used by the POP server to be a sub-directory with the same name as the POP authentication user-id. This allows multiple POP clients to read the spooled messages without interfering with each other. Content files can stay in the main spool directory with the envelope files copied into user-specific sub-directories. The \fIemailrelay-filter-copy\fR program is a convenient way of doing this when run via \fI--filter\fR.
+Modifies the spool directory used by the POP server to be a sub-directory with the same name as the POP authentication user-id. This allows multiple POP clients to read the spooled messages without interfering with each other, particularly when also  using \fI--pop-no-delete\fR. Content files can stay in the main spool  directory with only the envelope files copied into user-specific  sub-directories. The \fIemailrelay-filter-copy\fR program is a  convenient way of doing this when run via \fI--filter\fR.
 .TP
 .B \-G, --pop-no-delete
 Disables the POP DELE command so that the command appears to succeed but mail messages are not deleted from the spool directory.
@ -199,6 +208,9 @@ Specifies a timeout (in seconds) for getting responses from remote SMTP servers.
 .B \-S, --server-auth \fI<file>\fR
 Enables SMTP server authentication of remote SMTP clients. Account names and passwords are taken from the specified secrets file. The secrets file should contain lines that have four space-separated fields, starting with \fIserver\fR in the first field; the second field is the password encoding (\fIplain\fR or \fImd5\fR), the third is the client user-id and the fourth is the password. The user-id is RFC-1891 xtext encoded, and the password is either xtext encoded or generated by \fIemailrelay-passwd\fR. A special value of \fI/pam\fR can be used for authentication using linux PAM.
 .TP
+.B --server-auth-config \fI<config>\fR
+Configures the SMTP server authentication module using a  semicolon-separated list of configuration items. Each item is a  single-character key, followed by a colon and then a comma-separated  list. A 'm' character introduces a preferred sub-set of the built-in  authentication mechanisms, and an 'x' is used for blocklisted  mechanisms.
+.TP
 .B \-K, --server-tls
 Enables TLS for incoming SMTP and POP connections. SMTP clients can then request TLS encryption by issuing the STARTTLS command. The \fI--server-tls-certificate\fR option must be used to define the server certificate.
 .TP
@ -224,7 +236,7 @@ When used with \fI--log\fR this option enables logging to the syslog even if the
 Selects and configures the low-level TLS library, using a comma-separated list of keywords. If OpenSSL and mbedTLS are both built in then keywords of \fIopenssl\fR and \fImbedtls\fR will select one or the other. Keywords like \fItlsv1.0\fR can be used to set a minimum TLS protocol version, or  \fI-tlsv1.2\fR to set a maximum version.
 .TP
 .B \-u, --user \fI<username>\fR
-When started as root the program switches to an non-privileged effective user-id when idle. This option can be used to define which user-id is used. Ignored on Windows.
+When started as root the program switches to an non-privileged effective user-id when idle. This option can be used to define which user-id is used. Specify \fIroot\fR to disable all user-id switching. Ignored on Windows.
 .TP
 .B \-v, --verbose
 Enables more verbose logging when used with \fI--log\fR, and more verbose help when used with \fI--help\fR.
--- a/doc/emailrelay.css
+++ b/doc/emailrelay.css
@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+  Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 */

 /*
--- a/doc/forwardto.svg
+++ b/doc/forwardto.svg
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
--- a/doc/index.html
+++ b/doc/index.html
@ -20,4 +20,4 @@
   </div>
 </body>
 </html>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/make-website
+++ b/doc/make-website
@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+# Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 #
 # 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
--- a/doc/readme.html
+++ b/doc/readme.html
@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "%-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
  <title>E-MailRelay Readme</title>
@ -44,9 +44,9 @@
    </p>
   <h2><a class="a-header" name="SH_1_2">Quick start</a></h2> <!-- index:2:SH:1:2:Quick start -->
    <p>
-     To use E-MailRelay in store-and-forward mode use the <em class="quote">--as-server</em> option to
+     To use E-MailRelay in store-and-forward mode use the <em>--as-server</em> option to
     start the storage daemon in the background, and then do delivery of spooled
-     messages by running with the <em class="quote">--as-client</em> option.
+     messages by running with the <em>--as-client</em> option.
    </p>

 <img src="serverclient.png" alt="image">
@ -62,7 +62,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     And then to forward the spooled mail to <em class="quote">smtp.example.com</em> run something
+     And then to forward the spooled mail to <em>smtp.example.com</em> run something
     like this:
    </p>

@ -71,7 +71,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     To get behaviour more like a proxy you can add the <em class="quote">--poll</em> and <em class="quote">--forward-to</em>
+     To get behaviour more like a proxy you can add the <em>--poll</em> and <em>--forward-to</em>
     options so that messages are forwarded continuously rather than on-demand.
    </p>

@ -89,7 +89,7 @@
      </div><!-- div-pre -->
    <p>
     Or for a proxy server that forwards each message soon after it has been
-     received, you can use <em class="quote">--as-proxy</em> or add <em class="quote">--forward-on-disconnect</em>:
+     received, you can use <em>--as-proxy</em> or add <em>--forward-on-disconnect</em>:
    </p>

      <div class="div-pre">
@ -98,7 +98,7 @@
      </div><!-- div-pre -->
    <p>
     To edit or filter e-mail as it passes through the proxy specify your filter
-     program with the <em class="quote">--filter</em> option, something like this:
+     program with the <em>--filter</em> option, something like this:
    </p>

      <div class="div-pre">
@ -106,7 +106,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     To run E-MailRelay as a POP server without SMTP use <em class="quote">--pop</em> and <em class="quote">--no-smtp</em>:
+     To run E-MailRelay as a POP server without SMTP use <em>--pop</em> and <em>--no-smtp</em>:
    </p>

      <div class="div-pre">
@ -114,13 +114,13 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     The <em class="quote">emailrelay-submit</em> utility can be used to put messages straight into the
+     The <em>emailrelay-submit</em> utility can be used to put messages straight into the
     spool directory so that the POP clients can fetch them.
    </p>

    <p>
     By default E-MailRelay will always reject connections from remote machines. To
-     allow connections from anywhere use the <em class="quote">--remote-clients</em> option, but please
+     allow connections from anywhere use the <em>--remote-clients</em> option, but please
     check your firewall settings to make sure this cannot be exploited by spammers.
    </p>

@ -139,7 +139,7 @@
    <ul>
     <li>README -- this document</li>
     <li>COPYING -- the GNU General Public License</li>
-     <li>INSTALL -- generic build &amp; install instructions</li>
+     <li>INSTALL -- generic build & install instructions</li>
     <li>AUTHORS -- authors, credits and additional copyrights</li>
     <li>userguide.txt -- user guide</li>
     <li>reference.txt -- reference document</li>
@ -148,14 +148,14 @@

    <p>
     Source code documentation will be generated when building from source if
-     <em class="quote">doxygen</em> is available.
+     <em>doxygen</em> is available.
    </p>
   <h2><a class="a-header" name="SH_1_4">Feedback</a></h2> <!-- index:2:SH:1:4:Feedback -->
    <p>
-     Please feel free to e-mail the author at <em class="quote">mailto:graeme_walker@users.sourceforge.net</em>.
+     Please feel free to e-mail the author at <em>mailto:graeme_walker@users.sourceforge.net</em>.
    </p>

 </div> <!-- div-main -->
 </body>
 </html>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/reference.html
+++ b/doc/reference.html
--- a/doc/reference.md
+++ b/doc/reference.md
@ -58,19 +58,27 @@ where &lt;option&gt; is:
    should normally contain one line that starts with `client` and that line
    should have between four and five space-separated fields; the second field
    is the password encoding (`plain` or `md5`), the third is the user-id and
-    the fourth is the password. The user-id is RFC-1891 xtext encoded, and the
+    the fourth is the password. The user-id is [RFC-1891][] xtext encoded, and the
    password is either xtext encoded or generated by `emailrelay-passwd`. If
    the remote server does not support SMTP authentication then the SMTP
    connection will fail.

+*   \-\-client-auth-config &lt;config&gt;
+
+    Configures the SMTP client authentication module using a  semicolon-separated
+    list of configuration items. Each item is a  single-character key, followed
+    by a colon and then a comma-separated  list. A 'm' character introduces an
+    ordered list of authentication  mechanisms, and an 'x' is used for
+    blocklisted mechanisms.
+
 *   \-\-client-filter &lt;program&gt; (-Y)

    Runs the specified external filter program whenever a mail message is
    forwarded. The filter is passed the name of the message file in the spool
    directory so that it can edit it as required. A network filter can be
-    specified as `net:<transport-address>` and prefixes of `spam:` and `exit:`
-    are also allowed. The `--filter` option is normally more useful than
-    `--client-filter`.
+    specified as `net:<transport-address>` and prefixes of `spam:`,
+    `spam-edit:` and `exit:` are also allowed. The `--filter` option is
+    normally more useful than `--client-filter`.

 *   \-\-client-interface &lt;ip-address&gt; (-6)

@ -137,11 +145,18 @@ where &lt;option&gt; is:
    useful when cross-referenced with the source code and they may expose
    plaintext passwords and mail message content.

+*   \-\-dnsbl &lt;config&gt;
+
+    Specifies a list of [DNSBL][] servers that are used to reject SMTP	connections
+    from blocked addresses. The configuration string is made up of
+    comma-separated fields: the DNS server's transport address, a timeout in
+    milliseconds, a rejection threshold, and then the list of DNSBL servers.
+
 *   \-\-domain &lt;fqdn&gt; (-D)

    Specifies the network name that is used in SMTP EHLO commands, `Received`
-    lines, and for generating authentication challenges. The default network
-    name it derived from a DNS lookup of the local hostname.
+    lines, and for generating authentication challenges. The default is derived
+    from a DNS lookup of the local hostname.

 *   \-\-dont-serve (-x)

@ -156,8 +171,10 @@ where &lt;option&gt; is:
    that it can edit it as required. The mail message is rejected if the filter
    program terminates with an exit code between 1 and 99. Use
    `net:<transport-address>` to communicate with a filter daemon over the
-    network, or `spam:<transport-address>` to talk to a spamassassin spamd
-    daemon, or `exit:<number>` to emulate a filter program that just exits.
+    network, or `spam:<transport-address>` for a spamassassin spamd daemon to
+    accept or reject mail messages, or  `spam-edit:<transport-address>` to have
+    spamassassin edit the message  content without rejecting it, or
+    `exit:<number>` to emulate a filter  program that just exits.

 *   \-\-filter-timeout &lt;time&gt; (-W)

@ -188,10 +205,15 @@ where &lt;option&gt; is:
    Windows only. Hides the application window and disables all message boxes.
    This is useful when running as a windows service.

+*   \-\-idle-timeout &lt;time&gt;
+
+    Specifies a timeout (in seconds) for receiving network traffic from  remote
+    SMTP and POP clients. The default is 1800 seconds.
+
 *   \-\-immediate (-m)

-    Causes mail messages to be forwarded as soon as they are submitted, even
-    before they are accepted. This can be used to do proxying without
+    Causes mail messages to be forwarded as they are received, even before	they
+    have been accepted. This can be used to do proxying without
    store-and-forward, but in practice clients tend to to time out while
    waiting for their mail message to be accepted.

@ -254,7 +276,7 @@ where &lt;option&gt; is:
 *   \-\-pop (-B)

    Enables the POP server listening, by default on port 110, providing access to
-    spooled mail messages. Negotiated TLS using the POP3 `STLS` command will be
+    spooled mail messages. Negotiated TLS using the POP `STLS` command will be
    enabled if the `--server-tls` option is also given.

 *   \-\-pop-auth &lt;file&gt; (-F)
@ -269,10 +291,10 @@ where &lt;option&gt; is:
    Modifies the spool directory used by the POP server to be a sub-directory
    with the same name as the POP authentication user-id. This allows multiple
    POP clients to read the spooled messages without interfering with each
-    other. Content files can stay in the main spool directory with the envelope
-    files copied into user-specific sub-directories. The
-    `emailrelay-filter-copy` program is a convenient way of doing this when run
-    via `--filter`.
+    other, particularly when also  using `--pop-no-delete`. Content files can
+    stay in the main spool  directory with only the envelope files copied into
+    user-specific  sub-directories. The `emailrelay-filter-copy` program is a
+    convenient way of doing this when run via `--filter`.

 *   \-\-pop-no-delete (-G)

@ -312,10 +334,18 @@ where &lt;option&gt; is:
    should contain lines that have four space-separated fields, starting with
    `server` in the first field; the second field is the password encoding
    (`plain` or `md5`), the third is the client user-id and the fourth is the
-    password. The user-id is RFC-1891 xtext encoded, and the password is either
+    password. The user-id is [RFC-1891][] xtext encoded, and the password is either
    xtext encoded or generated by `emailrelay-passwd`. A special value of
    `/pam` can be used for authentication using linux PAM.

+*   \-\-server-auth-config &lt;config&gt;
+
+    Configures the SMTP server authentication module using a  semicolon-separated
+    list of configuration items. Each item is a  single-character key, followed
+    by a colon and then a comma-separated  list. A 'm' character introduces a
+    preferred sub-set of the built-in  authentication mechanisms, and an 'x' is
+    used for blocklisted	mechanisms.
+
 *   \-\-server-tls (-K)

    Enables TLS for incoming SMTP and POP connections. SMTP clients can then
@ -370,7 +400,7 @@ where &lt;option&gt; is:

    When started as root the program switches to an non-privileged effective
    user-id when idle. This option can be used to define which user-id is used.
-    Ignored on Windows.
+    Specify `root` to disable all user-id switching. Ignored on Windows.

 *   \-\-verbose (-v)

@ -382,7 +412,7 @@ where &lt;option&gt; is:
    Displays version information and then exits.

 A configuration file can be used to provide additional options; put each
-options on a separate line, use the long option names but without the double
+option on a separate line, use the long option names but without the double
 dash, and separate the option name from the option value with spaces.

 All command-line options that specify a filename can use a special `@app`
@ -392,9 +422,9 @@ the `emailrelay` executable or MacOS application bundle.
 Message store
 -------------
 Mail messages are stored as text files in the configured spool directory. Each
-e-mail message is represented as an envelope file and a content file. The envelope
-file contains parameters relevant to the SMTP dialogue, and the content file
-contains the RFC-822 headers and body text.
+e-mail message is represented as an envelope file and a content file. The
+envelope file contains parameters relevant to the SMTP dialogue, and the
+content file contains the [RFC-822][] headers and body text.

 The filenames used in the message store have a prefix of `emailrelay`, followed
 by a process-id, timestamp and sequence number, and then `envelope` or
@ -439,8 +469,8 @@ Mail processing
 The `--filter` command-line option allows you to specify a mail processing
 program which operates on e-mail messages as they pass through the E-MailRelay
 system. The filter program is run as soon as the e-mail message has been stored
-in the spool directory, with the full path of the content file added onto the
-end of the given command-line.
+in the spool directory, with the full path of the content file and envelope
+file put on the command-line.

 For example, the following command will start a proxy server on port 587
 which processes mail using the specified filter program, and then forwards the
@ -472,9 +502,10 @@ message use an exit code of 100.

 If the filter program creates completely new e-mail messages in the spool
 directory then they may not be processed immediately, or they may be completely
-ignored.  To get E-MailRelay to pick up any new messages you create in the spool
-directory use the special 103 exit code, or rely on the `--poll` mechanism, or
-perhaps run `emailrelay --as-client` from within the filter program.
+ignored.  To get E-MailRelay to pick up any new messages you create in the
+spool directory use the special 103 exit code, or rely on the `--poll`
+mechanism, or perhaps run `emailrelay --as-client` from within the filter
+program.

 As an example of a simple filter program processor this shell script examines
 the sending client's IP address and conditionally passes the message into
@ -483,7 +514,7 @@ the sending client's IP address and conditionally passes the message into
        #!/bin/sh
        # filter.sh
        content="${1}"
-        envelope="`echo \"${content}\" | sed 's/content/envelope.new/'`"
+        envelope="${2}"
        ip="`awk '/MailRelay-Client:/ {print $2;exit}' \"${envelope}\"`"
        if test "${ip}" = "192.168.0.2"
        then
@ -505,7 +536,7 @@ For Windows this example can be rewritten in JavaScript:

        // filter.js
        var content = WScript.Arguments(0) ;
-        var envelope = content.substr(0,content.length-7) + "envelope.new" ;
+        var envelope = WScript.Arguments(1) ;
        var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
        var ts = fs.OpenTextFile( envelope , 1 , false ) ;
        var e = ts.ReadAll() ;
@ -532,30 +563,33 @@ Either forward-slashes or back-slashes can be used.

 E-MailRelay also has a `--client-filter` option that enables processing of
 e-mail messages just before they are forwarded, rather than after they are
-stored. The disadvantage is that by then it is too late to notify the submitting
-SMTP client of any processing failures, so in many store-and-forward
+stored. The disadvantage is that by then it is too late to notify the
+submitting SMTP client of any processing failures, so in many store-and-forward
 applications using `--filter` is more useful. The special exit code of 100 can
-be used to ignore the current message, and 102 to stop scanning for more spooled
-messages after processing the current one (eg. for simple rate-limiting).
+be used to ignore the current message, and 102 to stop scanning for more
+spooled messages after processing the current one (eg. for simple
+rate-limiting).

 Bear in mind the following points when writing `--filter` programs:

-* The standard input and output are not used; the content filename is passed on the command-line.
+* The standard input and output are not used; the message filename is passed on the command-line.
 * Programs are run with a reduced set of environment variables.
 * E-MailRelay files use CR-LF line terminators, as required by the RFCs.
 * Envelope files will have a file extension of `.new` or `.busy` when the program runs.
 * Windows scripts may need to be run via `cscript` or a batch file wrapper.

 It is also possible to do message filtering in a separate process by using
-`net:<transport-address>` as the `--filter` or `--client-filter` option parameter.
-E-MailRelay connects to this address and then uses a simple line-based dialog as
-each e-mail message is processed where it sends the full path of the message
+`net:<tcp-address>` as the `--filter` or `--client-filter` option parameter.
+E-MailRelay connects to this address and then uses a simple line-based dialog
+as each e-mail message is processed: it sends the full path of the message
 content file in one line and expects the remote process to respond with an `ok`
-line if the message is to be accepted or an error message.
+line if the message is to be accepted or an error message. If the error message
+contains a tab character then anything after the tab character is logged but
+otherwise ignored.

-Alternatively, use `spam:<transport-address>` for connecting to a SpamAssassim
-`spamd` server, or use `exit:<exit-code>` for simulating a filter program
-that just does an exit with the specified exit code.
+Alternatively, use `spam:<tcp-address>` or `spam-edit:<tcp-address>` to connect
+to a SpamAssassim `spamd` server, or use `exit:<exit-code>` for simulating a
+filter program that just does an exit with the specified exit code.

 Authentication
 --------------
@ -571,12 +605,12 @@ usernames and passwords:
        emailrelay --as-client=example.com:smtp --client-auth=/etc/emailrelay-server.auth

 The client-side secrets file specified with `--client-auth` is used when
-E-MailRelay acts as a client to talk to a remote server. The file should contain
-at least one `client` entry.
+E-MailRelay acts as a client to talk to a remote server. The file should
+contain at least one `client` entry.

 The server-side secrets file specified with `--server-auth` is used when a
-remote client tries to authenticate with the E-MailRelay server. The file should
-normally contain several `server` entries, one for each remote client.
+remote client tries to authenticate with the E-MailRelay server. The file
+should normally contain several `server` entries, one for each remote client.

 ![authentication.png](authentication.png)

@ -594,16 +628,18 @@ Lines have four white-space delimited fields:
 * `password`

 The `client-or-server` field must be `client` or `server`; the `password-type`
-field must be `plain` or `md5`; the `userid` field is xtext-encoded
+field should be `plain` or `md5`; the `userid` field is xtext-encoded
 user identifier; and the `password` field is the xtext-encoded plain password
 or a base64-encoded `HMAC-MD5` state. For `client` lines the password-type can
 also be `oauth`.

 The first two fields are case-insensitive. The `xtext` encoding scheme is
-defined properly in RFC-1891, but basically it says that non-alphanumeric
+defined properly in [RFC-3461][], but basically it says that non-alphanumeric
 characters (including space, `+`, `#` and `=`) should be represented in
 uppercase hexadecimal ascii as `+XX`. So a space should be written as `+20`;
-`+` as `+2B`; `#` as `+23`; and `=` as `+3D`.
+`+` as `+2B`; `#` as `+23`; and `=` as `+3D`. Also note that modern email
+services will expect userids and passwords containing non-ASCII characters to
+use UTF-8 encoding with [RFC-4013][] normalisation applied.

 Authentication proceeds according to an authentication 'mechanism' that is
 advertised by the server and selected by the client. Many authentication
@ -650,12 +686,13 @@ When the `--server-auth` option is used clients must authenticate with the
 E-MailRelay server but it is possible to configure some client IP addresses as
 'trusted' so that connections from these addresses do not have to authenticate.

-Trusted IP addresses are configured with lines in the secrets file having `server`
-in the first field, `none` in the second field, a wildcarded IP address in
-the third field, and an arbitrary keyword in the fourth field. The keyword field
-is passed to any external address verifier program specified by the
-`--address-verifier` command-line option; it is not used for any other purpose.
-Wildcarded IPv4 addresses can use a format like 192.168.0.0/24 or 192.168.0.*.
+Trusted IP addresses are configured with lines in the secrets file having
+`server` in the first field, `none` in the second field, a wildcarded IP
+address in the third field, and an arbitrary keyword in the fourth field. The
+keyword field is passed to any external address verifier program specified by
+the `--address-verifier` command-line option; it is not used for any other
+purpose. Wildcarded IPv4 addresses can use a format like 192.168.0.0/24 or
+192.168.0.*.

 For example, this secrets file allows any client connecting over IPv4 from the
 192.168.0.0/24 address range, or over IPv6 from the fe80::/64 or fc00::/7
@ -670,12 +707,13 @@ ranges, to connect without authentication:
        server plain carol my+20password

 On the client side, authentication is performed when E-MailRelay connects to a
-server which implements the SMTP AUTH extension with one of the supported
-mechanisms. If the remote server does not support the AUTH extension, or does not
-support mechanisms for which E-MailRelay has secrets, then an error will be
-logged and no messages will be forward.
+server that implements the SMTP AUTH extension with one of the supported
+mechanisms. If client-side authentication is required but the remote server
+does not support the AUTH extension, or does not support mechanisms for which
+E-MailRelay has secrets, then an error will be logged and no messages will be
+forwarded.

-When E-MailRelay successfully authenticates with the remote server the session
+When E-MailRelay successfully authenticates with the remote server the
 authentication name is passed as the AUTH parameter of the SMTP MAIL FROM
 command, ignoring any AUTH name from the original submission. This default
 policy can be modified by editing the `MailFromAuthOut` field in the message
@ -696,8 +734,9 @@ connections start off as unencrypted and the SMTP command `STARTTLS` (or the
 POP `STLS` command) can be used to negotiate TLS encryption before any
 passwords are exchanged.

-The `--server-tls` option requires that the `--server-tls-certificate` option is
-used to specify a PEM-format file containing a X.509 certificate and private key.
+The `--server-tls` option requires that the `--server-tls-certificate` option
+is used to specify a PEM-format file containing a X.509 certificate and private
+key.

 This OpenSSL command can be used to create a self-signed certificate file
 suitable for testing:
@ -713,8 +752,8 @@ options for more details.

 E-MailRelay can also make outgoing SMTP connections using TLS encryption where
 the whole SMTP dialog is encrypted from the start (`--client-tls-connection`).
-This is sometimes called SMTP-over-TLS or secure SMTP (smtps) and it is normally
-used with port number 465.
+This is sometimes called SMTP-over-TLS or secure SMTP (smtps) or implicit TLS
+and it is normally used with port number 465.

 PAM Authentication
 ------------------
@ -744,8 +783,8 @@ account names and passwords to authenticate remote clients. On some systems
 this will require special permissioning to allow the E-MailRelay server to
 read the shadow password database.

-When using PAM authentication E-MailRelay requires that remote clients establish
-an encrypted session using TLS before authentication can proceed.
+When using PAM authentication E-MailRelay requires that remote clients
+establish an encrypted session using TLS before authentication can proceed.

 IP addresses
 ------------
@ -760,8 +799,8 @@ Eg:

        --interface 127.0.0.1

-If the `--client-interface` option is used then that address is used to bind the
-local end of outgoing SMTP client connections.
+If the `--client-interface` option is used then that address is used to bind
+the local end of outgoing SMTP client connections.

 Eg:

@ -787,8 +826,8 @@ The IPv4 and IPv6 wildcard addresses (`0.0.0.0` and `::`) can be used with
 `--interface` and `--client-interface` to enable the use of IPv4 only or IPv6
 only.

-To use IPv4 only for incoming connections use `--interface 0.0.0.0`; for IPv6 only
-on incoming connections use `--interface ::`.
+To use IPv4 only for incoming connections use `--interface 0.0.0.0`; for IPv6
+only on incoming connections use `--interface ::`.

        --interface 0.0.0.0 # IPv4 only
        --interface ::      # IPv6 only
@ -800,8 +839,8 @@ for IPv6 only on outgoing SMTP connections use `--client-interface ::`.
        --client-interface ::      # IPv6 only

 Hostnames given in the `--forward-to`, `--as-proxy` and `--as-client` options
-are resolved to IPv4 addresses and/or IPv6 addresses using DNS. If both IPv4 and
-IPv6 records are returned from the DNS query then the `--client-interface`
+are resolved to IPv4 addresses and/or IPv6 addresses using DNS. If both IPv4
+and IPv6 records are returned from the DNS query then the `--client-interface`
 option can be used to select either the IPv4 or IPv6 results. Otherwise the
 first address is used, whether that is IPv4 or IPv6.

@ -812,9 +851,9 @@ Eg:

 SOCKS
 -----
-E-MailRelay can use a [SOCKS][] 4a proxy for establishing outgoing SMTP connections;
-just append the SOCKS proxy address to the SMTP server's address, separated by
-`@`.
+E-MailRelay can use a [SOCKS][] 4a proxy for establishing outgoing SMTP
+connections; just append the SOCKS proxy address to the SMTP server's address,
+separated by `@`.

 For example, this could be used to send e-mails via the Tor network, assuming
 there is a local Tor node running on port 9050:
@ -842,13 +881,13 @@ mechanism used by the client (if any, and `none` if trusted), and (6) either
 the authentication name or the fourth field from authentication secrets file
 if a trusted IP address.

-So, for example, a verifier program called `myverifier` might be run with the
-following command-line:
+So, for example, a verifier program called `myverifier` might be run as if with
+the following command-line:

        myverifier bob@local.net alice@example.com 192.168.0.1:123 local.net login alice

-The verifier program is expected to generate two lines of output on the standard
-output stream and then terminate with a specific exit code.
+The verifier program is expected to generate two lines of output on the
+standard output stream and then terminate with a specific exit code.

 For future-proofing a verifier must report a version number of `2.0` if called
 with a command-line starting with `--emailrelay-version`.
@ -874,9 +913,11 @@ name \-\- and then exit with a value of zero.
        echo postmaster
        exit 0

-For E-MailRelay local delivery just means that the message file in the spool
-directory is given a `.local` filename suffix. This can be used to create a
-separate channel for administrative messages such as delivery reports.
+For E-MailRelay local delivery just means that the message files in the spool
+directory are copied to files with a `.local` filename suffix. If all the
+envelope recipients are local-mailboxes then no normal message files are
+created. This mechanism can be used to create a separate channel for
+administrative messages such as delivery reports.

 For invalid addresses the exit value should be non-zero and the first line
 of output is the error response.
@ -900,8 +941,8 @@ which may be useful in limiting the impact of denial of service attacks:
        # address verifier -- abort
        exit 100

-In this more complete example the verifier script accepts all addresses as valid
-as long as they contain an `at` character:
+In this more complete example the verifier script accepts all addresses as
+valid as long as they contain an `at` character:

        #!/bin/sh
        # address verifier -- accept only if containing an at sign
@ -961,16 +1002,44 @@ or written in JavaScript for Windows:
            WScript.Quit( 3 ) ;
        }

-If this verifier script is used with a suitable `--server-auth` file then it can
-be used to prevent open relay without restricting authenticated clients.
+If this verifier script is used with a suitable `--server-auth` file then it
+can be used to prevent open relay without restricting authenticated clients.

 It is also possible to verify addresses in a separate daemon process by using a
-`--address-verifier` option of the form `net:<transport-address>`. In this case
+`--address-verifier` option of the form `net:<tcp-address>`. In this case
 E-MailRelay will connect to the specified verifier daemon over the network and
 send address verification requests as lines with pipe-delimited fields. The
-expected response is another pipe-delimited line containing the same information
-as returned by verifier scripts but in reverse, such as `3|address unavailable`
-or `0|postmaster|Local Postmaster <postmaster@localhost>`.
+expected response is another pipe-delimited line containing the same
+information as returned by verifier scripts but in reverse, such as
+`3|address unavailable` or `0|postmaster|Local Postmaster <postmaster@eg.com>`.
+
+Connection blocking
+-------------------
+All incoming connections from remote network addresses are blocked by default,
+but can be allowed by using the `--remote-clients`/`-r` option. This is to
+guard against accidental exposure to the internet.
+
+Incoming SMTP connections can also be checked against DNSBL blocklists in order
+to block connections from known spammers. Use the `--dnsbl` option to define a
+list of DNSBL servers, together with a rejection threshold. If the threshold
+number of servers 'deny' the incoming connection's network address then
+E-MailRelay will drop the connection immediately.
+
+The `--dnsbl` configuration starts with the DNS server network address and a
+millisond timeout, followed by the threshold and list of servers:
+
+        emailrelay -r --dnsbl 1.1.1.1:53,500,1,spam.example.com,block.example.com ...
+
+A threshold of zero means that the DNSBL servers are consulted but connections
+are always allowed. This can be combined with verbose logging (`--log -v`)
+for initial testing.
+
+If the timeout period expires before a collective decision is reached then the
+connection is allowed. This default behaviour can be changed by using a negative
+timeout, but for finer control use a DNSBL proxy.
+
+Connections from loopback and private ([RFC-1918][]) network addresses are never
+checked.

 Security issues
 ---------------
@ -1043,8 +1112,8 @@ The following are some security issues that have been taken into consideration:
    When using PAM for authentication all clients are required to use
    TLS/SSL encryption.

-Security issues which relate to the SMTP protocol itself are beyond the scope of
-this document, but RFC-2821 makes the following observation: "SMTP mail is
+Security issues which relate to the SMTP protocol itself are beyond the scope
+of this document, but [RFC-2821][] makes the following observation: "SMTP mail is
 inherently insecure in that it is feasible for even [..] casual users to [..]
 create messages that will trick a [..] recipient into believing that they came
 from somewhere else. [..] Real [..] security lies [..] in end-to-end methods
@ -1107,6 +1176,7 @@ Installation directories can be defined at build-time by the following
 * e_pamdir=&lt;dir&gt;
 * e_spooldir=&lt;dir&gt;
 * e_sysconfdir=&lt;dir&gt;
+* e_rundir=&lt;dir&gt;

 These are all defaulted to paths that are ultimately based on `--prefix`, so
 `./configure --prefix=$HOME` will work as expected.
@ -1114,7 +1184,7 @@ These are all defaulted to paths that are ultimately based on `--prefix`, so
 For a directory structure conforming more closely to the [FHS][] use this configure
 command:

-        ./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d
+        ./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d e_rundir=/run/emailrelay

 It is possible to change the installation root directory after building by
 using `make DESTDIR=<root> install` or `DESTDIR=<root> make -e install`.
@ -1129,13 +1199,20 @@ and these default to `%ProgramFiles%/E-MailRelay` for programs and



+[DNSBL]: https://en.wikipedia.org/wiki/DNSBL
 [FHS]: https://wiki.linuxfoundation.org/lsb/fhs
 [MTA]: https://en.wikipedia.org/wiki/Message_transfer_agent
 [PAM]: https://en.wikipedia.org/wiki/Linux_PAM
 [POP]: https://en.wikipedia.org/wiki/Post_Office_Protocol
+[RFC-1891]: https://tools.ietf.org/html/rfc1891
+[RFC-1918]: https://tools.ietf.org/html/rfc1918
+[RFC-2821]: https://tools.ietf.org/html/rfc2821
+[RFC-3461]: https://tools.ietf.org/html/rfc3461
+[RFC-4013]: https://tools.ietf.org/html/rfc4013
+[RFC-822]: https://tools.ietf.org/html/rfc822
 [SMTP]: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
 [SOCKS]: https://en.wikipedia.org/wiki/SOCKS
 [TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security

 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/reference.rst
+++ b/doc/reference.rst
@ -61,19 +61,27 @@ where \<option\> is:
    should normally contain one line that starts with *client* and that line
    should have between four and five space-separated fields; the second field
    is the password encoding (*plain* or *md5*), the third is the user-id and
-    the fourth is the password. The user-id is RFC-1891 xtext encoded, and the
+    the fourth is the password. The user-id is RFC-1891_ xtext encoded, and the
    password is either xtext encoded or generated by *emailrelay-passwd*. If
    the remote server does not support SMTP authentication then the SMTP
    connection will fail.

+*   --client-auth-config \<config\>
+
+    Configures the SMTP client authentication module using a  semicolon-separated
+    list of configuration items. Each item is a  single-character key, followed
+    by a colon and then a comma-separated  list. A 'm' character introduces an
+    ordered list of authentication  mechanisms, and an 'x' is used for
+    blocklisted mechanisms.
+
 *   --client-filter \<program\> (-Y)

    Runs the specified external filter program whenever a mail message is
    forwarded. The filter is passed the name of the message file in the spool
    directory so that it can edit it as required. A network filter can be
-    specified as *net:<transport-address>* and prefixes of *spam:* and *exit:*
-    are also allowed. The *--filter* option is normally more useful than
-    \ *--client-filter*\ .
+    specified as *net:<transport-address>* and prefixes of *spam:*,
+    *spam-edit:* and *exit:* are also allowed. The *--filter* option is
+    normally more useful than *--client-filter*.

 *   --client-interface \<ip-address\> (-6)

@ -140,11 +148,18 @@ where \<option\> is:
    useful when cross-referenced with the source code and they may expose
    plaintext passwords and mail message content.

+*   --dnsbl \<config\>
+
+    Specifies a list of DNSBL_ servers that are used to reject SMTP	connections
+    from blocked addresses. The configuration string is made up of
+    comma-separated fields: the DNS server's transport address, a timeout in
+    milliseconds, a rejection threshold, and then the list of DNSBL servers.
+
 *   --domain \<fqdn\> (-D)

    Specifies the network name that is used in SMTP EHLO commands, *Received*
-    lines, and for generating authentication challenges. The default network
-    name it derived from a DNS lookup of the local hostname.
+    lines, and for generating authentication challenges. The default is derived
+    from a DNS lookup of the local hostname.

 *   --dont-serve (-x)

@ -159,8 +174,10 @@ where \<option\> is:
    that it can edit it as required. The mail message is rejected if the filter
    program terminates with an exit code between 1 and 99. Use
    *net:<transport-address>* to communicate with a filter daemon over the
-    network, or *spam:<transport-address>* to talk to a spamassassin spamd
-    daemon, or *exit:<number>* to emulate a filter program that just exits.
+    network, or *spam:<transport-address>* for a spamassassin spamd daemon to
+    accept or reject mail messages, or  *spam-edit:<transport-address>* to have
+    spamassassin edit the message  content without rejecting it, or
+    *exit:<number>* to emulate a filter  program that just exits.

 *   --filter-timeout \<time\> (-W)

@ -191,10 +208,15 @@ where \<option\> is:
    Windows only. Hides the application window and disables all message boxes.
    This is useful when running as a windows service.

+*   --idle-timeout \<time\>
+
+    Specifies a timeout (in seconds) for receiving network traffic from  remote
+    SMTP and POP clients. The default is 1800 seconds.
+
 *   --immediate (-m)

-    Causes mail messages to be forwarded as soon as they are submitted, even
-    before they are accepted. This can be used to do proxying without
+    Causes mail messages to be forwarded as they are received, even before	they
+    have been accepted. This can be used to do proxying without
    store-and-forward, but in practice clients tend to to time out while
    waiting for their mail message to be accepted.

@ -257,7 +279,7 @@ where \<option\> is:
 *   --pop (-B)

    Enables the POP server listening, by default on port 110, providing access to
-    spooled mail messages. Negotiated TLS using the POP3 *STLS* command will be
+    spooled mail messages. Negotiated TLS using the POP *STLS* command will be
    enabled if the *--server-tls* option is also given.

 *   --pop-auth \<file\> (-F)
@ -272,10 +294,10 @@ where \<option\> is:
    Modifies the spool directory used by the POP server to be a sub-directory
    with the same name as the POP authentication user-id. This allows multiple
    POP clients to read the spooled messages without interfering with each
-    other. Content files can stay in the main spool directory with the envelope
-    files copied into user-specific sub-directories. The
-    *emailrelay-filter-copy* program is a convenient way of doing this when run
-    via *--filter*.
+    other, particularly when also  using *--pop-no-delete*. Content files can
+    stay in the main spool  directory with only the envelope files copied into
+    user-specific  sub-directories. The *emailrelay-filter-copy* program is a
+    convenient way of doing this when run via *--filter*.

 *   --pop-no-delete (-G)

@ -315,10 +337,18 @@ where \<option\> is:
    should contain lines that have four space-separated fields, starting with
    *server* in the first field; the second field is the password encoding
    (*plain* or *md5*), the third is the client user-id and the fourth is the
-    password. The user-id is RFC-1891 xtext encoded, and the password is either
+    password. The user-id is RFC-1891_ xtext encoded, and the password is either
    xtext encoded or generated by *emailrelay-passwd*. A special value of
    */pam* can be used for authentication using linux PAM.

+*   --server-auth-config \<config\>
+
+    Configures the SMTP server authentication module using a  semicolon-separated
+    list of configuration items. Each item is a  single-character key, followed
+    by a colon and then a comma-separated  list. A 'm' character introduces a
+    preferred sub-set of the built-in  authentication mechanisms, and an 'x' is
+    used for blocklisted	mechanisms.
+
 *   --server-tls (-K)

    Enables TLS for incoming SMTP and POP connections. SMTP clients can then
@ -373,7 +403,7 @@ where \<option\> is:

    When started as root the program switches to an non-privileged effective
    user-id when idle. This option can be used to define which user-id is used.
-    Ignored on Windows.
+    Specify *root* to disable all user-id switching. Ignored on Windows.

 *   --verbose (-v)

@ -385,7 +415,7 @@ where \<option\> is:
    Displays version information and then exits.

 A configuration file can be used to provide additional options; put each
-options on a separate line, use the long option names but without the double
+option on a separate line, use the long option names but without the double
 dash, and separate the option name from the option value with spaces.

 All command-line options that specify a filename can use a special *@app*
@ -395,9 +425,9 @@ the *emailrelay* executable or MacOS application bundle.
 Message store
 =============
 Mail messages are stored as text files in the configured spool directory. Each
-e-mail message is represented as an envelope file and a content file. The envelope
-file contains parameters relevant to the SMTP dialogue, and the content file
-contains the RFC-822 headers and body text.
+e-mail message is represented as an envelope file and a content file. The
+envelope file contains parameters relevant to the SMTP dialogue, and the
+content file contains the RFC-822_ headers and body text.

 The filenames used in the message store have a prefix of *emailrelay*, followed
 by a process-id, timestamp and sequence number, and then *envelope* or
@ -442,8 +472,8 @@ Mail processing
 The *--filter* command-line option allows you to specify a mail processing
 program which operates on e-mail messages as they pass through the E-MailRelay
 system. The filter program is run as soon as the e-mail message has been stored
-in the spool directory, with the full path of the content file added onto the
-end of the given command-line.
+in the spool directory, with the full path of the content file and envelope
+file put on the command-line.

 For example, the following command will start a proxy server on port 587
 which processes mail using the specified filter program, and then forwards the
@ -477,9 +507,10 @@ message use an exit code of 100.

 If the filter program creates completely new e-mail messages in the spool
 directory then they may not be processed immediately, or they may be completely
-ignored.  To get E-MailRelay to pick up any new messages you create in the spool
-directory use the special 103 exit code, or rely on the *--poll* mechanism, or
-perhaps run *emailrelay --as-client* from within the filter program.
+ignored.  To get E-MailRelay to pick up any new messages you create in the
+spool directory use the special 103 exit code, or rely on the *--poll*
+mechanism, or perhaps run *emailrelay --as-client* from within the filter
+program.

 As an example of a simple filter program processor this shell script examines
 the sending client's IP address and conditionally passes the message into
@ -490,7 +521,7 @@ the sending client's IP address and conditionally passes the message into
    #!/bin/sh
    # filter.sh
    content="${1}"
-    envelope="`echo \"${content}\" | sed 's/content/envelope.new/'`"
+    envelope="${2}"
    ip="`awk '/MailRelay-Client:/ {print $2;exit}' \"${envelope}\"`"
    if test "${ip}" = "192.168.0.2"
    then
@ -514,7 +545,7 @@ For Windows this example can be rewritten in JavaScript:

    // filter.js
    var content = WScript.Arguments(0) ;
-    var envelope = content.substr(0,content.length-7) + "envelope.new" ;
+    var envelope = WScript.Arguments(1) ;
    var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
    var ts = fs.OpenTextFile( envelope , 1 , false ) ;
    var e = ts.ReadAll() ;
@ -543,30 +574,33 @@ Either forward-slashes or back-slashes can be used.

 E-MailRelay also has a *--client-filter* option that enables processing of
 e-mail messages just before they are forwarded, rather than after they are
-stored. The disadvantage is that by then it is too late to notify the submitting
-SMTP client of any processing failures, so in many store-and-forward
+stored. The disadvantage is that by then it is too late to notify the
+submitting SMTP client of any processing failures, so in many store-and-forward
 applications using *--filter* is more useful. The special exit code of 100 can
-be used to ignore the current message, and 102 to stop scanning for more spooled
-messages after processing the current one (eg. for simple rate-limiting).
+be used to ignore the current message, and 102 to stop scanning for more
+spooled messages after processing the current one (eg. for simple
+rate-limiting).

 Bear in mind the following points when writing *--filter* programs:

-* The standard input and output are not used; the content filename is passed on the command-line.
+* The standard input and output are not used; the message filename is passed on the command-line.
 * Programs are run with a reduced set of environment variables.
 * E-MailRelay files use CR-LF line terminators, as required by the RFCs.
 * Envelope files will have a file extension of *.new* or *.busy* when the program runs.
 * Windows scripts may need to be run via *cscript* or a batch file wrapper.

 It is also possible to do message filtering in a separate process by using
-*net:<transport-address>* as the *--filter* or *--client-filter* option parameter.
-E-MailRelay connects to this address and then uses a simple line-based dialog as
-each e-mail message is processed where it sends the full path of the message
+*net:<tcp-address>* as the *--filter* or *--client-filter* option parameter.
+E-MailRelay connects to this address and then uses a simple line-based dialog
+as each e-mail message is processed: it sends the full path of the message
 content file in one line and expects the remote process to respond with an *ok*
-line if the message is to be accepted or an error message.
+line if the message is to be accepted or an error message. If the error message
+contains a tab character then anything after the tab character is logged but
+otherwise ignored.

-Alternatively, use *spam:<transport-address>* for connecting to a SpamAssassim
-*spamd* server, or use *exit:<exit-code>* for simulating a filter program
-that just does an exit with the specified exit code.
+Alternatively, use *spam:<tcp-address>* or *spam-edit:<tcp-address>* to connect
+to a SpamAssassim *spamd* server, or use *exit:<exit-code>* for simulating a
+filter program that just does an exit with the specified exit code.

 Authentication
 ==============
@ -584,12 +618,12 @@ usernames and passwords:
    emailrelay --as-client=example.com:smtp --client-auth=/etc/emailrelay-server.auth

 The client-side secrets file specified with *--client-auth* is used when
-E-MailRelay acts as a client to talk to a remote server. The file should contain
-at least one *client* entry.
+E-MailRelay acts as a client to talk to a remote server. The file should
+contain at least one *client* entry.

 The server-side secrets file specified with *--server-auth* is used when a
-remote client tries to authenticate with the E-MailRelay server. The file should
-normally contain several *server* entries, one for each remote client.
+remote client tries to authenticate with the E-MailRelay server. The file
+should normally contain several *server* entries, one for each remote client.

 .. image:: authentication.png
   :alt: authentication.png
@ -609,16 +643,18 @@ Lines have four white-space delimited fields:
 * \ *password*\

 The *client-or-server* field must be *client* or *server*; the *password-type*
-field must be *plain* or *md5*; the *userid* field is xtext-encoded
+field should be *plain* or *md5*; the *userid* field is xtext-encoded
 user identifier; and the *password* field is the xtext-encoded plain password
 or a base64-encoded *HMAC-MD5* state. For *client* lines the password-type can
 also be *oauth*.

 The first two fields are case-insensitive. The *xtext* encoding scheme is
-defined properly in RFC-1891, but basically it says that non-alphanumeric
+defined properly in RFC-3461_, but basically it says that non-alphanumeric
 characters (including space, *+*, *#* and *=*) should be represented in
 uppercase hexadecimal ascii as *+XX*. So a space should be written as *+20*;
-*+* as *+2B*; *#* as *+23*; and *=* as *+3D*.
+*+* as *+2B*; *#* as *+23*; and *=* as *+3D*. Also note that modern email
+services will expect userids and passwords containing non-ASCII characters to
+use UTF-8 encoding with RFC-4013_ normalisation applied.

 Authentication proceeds according to an authentication 'mechanism' that is
 advertised by the server and selected by the client. Many authentication
@ -669,12 +705,13 @@ When the *--server-auth* option is used clients must authenticate with the
 E-MailRelay server but it is possible to configure some client IP addresses as
 'trusted' so that connections from these addresses do not have to authenticate.

-Trusted IP addresses are configured with lines in the secrets file having *server*
-in the first field, *none* in the second field, a wildcarded IP address in
-the third field, and an arbitrary keyword in the fourth field. The keyword field
-is passed to any external address verifier program specified by the
-*--address-verifier* command-line option; it is not used for any other purpose.
-Wildcarded IPv4 addresses can use a format like 192.168.0.0/24 or 192.168.0.*.
+Trusted IP addresses are configured with lines in the secrets file having
+*server* in the first field, *none* in the second field, a wildcarded IP
+address in the third field, and an arbitrary keyword in the fourth field. The
+keyword field is passed to any external address verifier program specified by
+the *--address-verifier* command-line option; it is not used for any other
+purpose. Wildcarded IPv4 addresses can use a format like 192.168.0.0/24 or
+192.168.0.*.

 For example, this secrets file allows any client connecting over IPv4 from the
 192.168.0.0/24 address range, or over IPv6 from the fe80::/64 or fc00::/7
@ -691,12 +728,13 @@ ranges, to connect without authentication:
    server plain carol my+20password

 On the client side, authentication is performed when E-MailRelay connects to a
-server which implements the SMTP AUTH extension with one of the supported
-mechanisms. If the remote server does not support the AUTH extension, or does not
-support mechanisms for which E-MailRelay has secrets, then an error will be
-logged and no messages will be forward.
+server that implements the SMTP AUTH extension with one of the supported
+mechanisms. If client-side authentication is required but the remote server
+does not support the AUTH extension, or does not support mechanisms for which
+E-MailRelay has secrets, then an error will be logged and no messages will be
+forwarded.

-When E-MailRelay successfully authenticates with the remote server the session
+When E-MailRelay successfully authenticates with the remote server the
 authentication name is passed as the AUTH parameter of the SMTP MAIL FROM
 command, ignoring any AUTH name from the original submission. This default
 policy can be modified by editing the *MailFromAuthOut* field in the message
@ -717,8 +755,9 @@ connections start off as unencrypted and the SMTP command *STARTTLS* (or the
 POP *STLS* command) can be used to negotiate TLS encryption before any
 passwords are exchanged.

-The *--server-tls* option requires that the *--server-tls-certificate* option is
-used to specify a PEM-format file containing a X.509 certificate and private key.
+The *--server-tls* option requires that the *--server-tls-certificate* option
+is used to specify a PEM-format file containing a X.509 certificate and private
+key.

 This OpenSSL command can be used to create a self-signed certificate file
 suitable for testing:
@ -736,8 +775,8 @@ options for more details.

 E-MailRelay can also make outgoing SMTP connections using TLS encryption where
 the whole SMTP dialog is encrypted from the start (\ *--client-tls-connection*\ ).
-This is sometimes called SMTP-over-TLS or secure SMTP (smtps) and it is normally
-used with port number 465.
+This is sometimes called SMTP-over-TLS or secure SMTP (smtps) or implicit TLS
+and it is normally used with port number 465.

 PAM Authentication
 ==================
@ -769,8 +808,8 @@ account names and passwords to authenticate remote clients. On some systems
 this will require special permissioning to allow the E-MailRelay server to
 read the shadow password database.

-When using PAM authentication E-MailRelay requires that remote clients establish
-an encrypted session using TLS before authentication can proceed.
+When using PAM authentication E-MailRelay requires that remote clients
+establish an encrypted session using TLS before authentication can proceed.

 IP addresses
 ============
@ -787,8 +826,8 @@ Eg:

    --interface 127.0.0.1

-If the *--client-interface* option is used then that address is used to bind the
-local end of outgoing SMTP client connections.
+If the *--client-interface* option is used then that address is used to bind
+the local end of outgoing SMTP client connections.

 Eg:

@ -820,8 +859,8 @@ The IPv4 and IPv6 wildcard addresses (*0.0.0.0* and *::*) can be used with
 *--interface* and *--client-interface* to enable the use of IPv4 only or IPv6
 only.

-To use IPv4 only for incoming connections use *--interface 0.0.0.0*; for IPv6 only
-on incoming connections use *--interface ::*.
+To use IPv4 only for incoming connections use *--interface 0.0.0.0*; for IPv6
+only on incoming connections use *--interface ::*.

 ::

@ -837,8 +876,8 @@ for IPv6 only on outgoing SMTP connections use *--client-interface ::*.
    --client-interface ::      # IPv6 only

 Hostnames given in the *--forward-to*, *--as-proxy* and *--as-client* options
-are resolved to IPv4 addresses and/or IPv6 addresses using DNS. If both IPv4 and
-IPv6 records are returned from the DNS query then the *--client-interface*
+are resolved to IPv4 addresses and/or IPv6 addresses using DNS. If both IPv4
+and IPv6 records are returned from the DNS query then the *--client-interface*
 option can be used to select either the IPv4 or IPv6 results. Otherwise the
 first address is used, whether that is IPv4 or IPv6.

@ -851,9 +890,9 @@ Eg:

 SOCKS
 =====
-E-MailRelay can use a SOCKS_ 4a proxy for establishing outgoing SMTP connections;
-just append the SOCKS proxy address to the SMTP server's address, separated by
-\ *@*\ .
+E-MailRelay can use a SOCKS_ 4a proxy for establishing outgoing SMTP
+connections; just append the SOCKS proxy address to the SMTP server's address,
+separated by *@*.

 For example, this could be used to send e-mails via the Tor network, assuming
 there is a local Tor node running on port 9050:
@ -883,15 +922,15 @@ mechanism used by the client (if any, and *none* if trusted), and (6) either
 the authentication name or the fourth field from authentication secrets file
 if a trusted IP address.

-So, for example, a verifier program called *myverifier* might be run with the
-following command-line:
+So, for example, a verifier program called *myverifier* might be run as if with
+the following command-line:

 ::

    myverifier bob@local.net alice@example.com 192.168.0.1:123 local.net login alice

-The verifier program is expected to generate two lines of output on the standard
-output stream and then terminate with a specific exit code.
+The verifier program is expected to generate two lines of output on the
+standard output stream and then terminate with a specific exit code.

 For future-proofing a verifier must report a version number of *2.0* if called
 with a command-line starting with *--emailrelay-version*.
@ -921,9 +960,11 @@ name -- and then exit with a value of zero.
    echo postmaster
    exit 0

-For E-MailRelay local delivery just means that the message file in the spool
-directory is given a *.local* filename suffix. This can be used to create a
-separate channel for administrative messages such as delivery reports.
+For E-MailRelay local delivery just means that the message files in the spool
+directory are copied to files with a *.local* filename suffix. If all the
+envelope recipients are local-mailboxes then no normal message files are
+created. This mechanism can be used to create a separate channel for
+administrative messages such as delivery reports.

 For invalid addresses the exit value should be non-zero and the first line
 of output is the error response.
@ -953,8 +994,8 @@ which may be useful in limiting the impact of denial of service attacks:
    # address verifier -- abort
    exit 100

-In this more complete example the verifier script accepts all addresses as valid
-as long as they contain an *at* character:
+In this more complete example the verifier script accepts all addresses as
+valid as long as they contain an *at* character:

 ::

@ -1020,16 +1061,46 @@ or written in JavaScript for Windows:
        WScript.Quit( 3 ) ;
    }

-If this verifier script is used with a suitable *--server-auth* file then it can
-be used to prevent open relay without restricting authenticated clients.
+If this verifier script is used with a suitable *--server-auth* file then it
+can be used to prevent open relay without restricting authenticated clients.

 It is also possible to verify addresses in a separate daemon process by using a
-*--address-verifier* option of the form *net:<transport-address>*. In this case
+*--address-verifier* option of the form *net:<tcp-address>*. In this case
 E-MailRelay will connect to the specified verifier daemon over the network and
 send address verification requests as lines with pipe-delimited fields. The
-expected response is another pipe-delimited line containing the same information
-as returned by verifier scripts but in reverse, such as *3|address unavailable*
-or *0|postmaster|Local Postmaster <postmaster@localhost>*.
+expected response is another pipe-delimited line containing the same
+information as returned by verifier scripts but in reverse, such as
+*3|address unavailable* or *0|postmaster|Local Postmaster <postmaster@eg.com>*.
+
+Connection blocking
+===================
+All incoming connections from remote network addresses are blocked by default,
+but can be allowed by using the *--remote-clients*/*-r* option. This is to
+guard against accidental exposure to the internet.
+
+Incoming SMTP connections can also be checked against DNSBL blocklists in order
+to block connections from known spammers. Use the *--dnsbl* option to define a
+list of DNSBL servers, together with a rejection threshold. If the threshold
+number of servers 'deny' the incoming connection's network address then
+E-MailRelay will drop the connection immediately.
+
+The *--dnsbl* configuration starts with the DNS server network address and a
+millisond timeout, followed by the threshold and list of servers:
+
+::
+
+    emailrelay -r --dnsbl 1.1.1.1:53,500,1,spam.example.com,block.example.com ...
+
+A threshold of zero means that the DNSBL servers are consulted but connections
+are always allowed. This can be combined with verbose logging (\ *--log -v*\ )
+for initial testing.
+
+If the timeout period expires before a collective decision is reached then the
+connection is allowed. This default behaviour can be changed by using a negative
+timeout, but for finer control use a DNSBL proxy.
+
+Connections from loopback and private (RFC-1918_) network addresses are never
+checked.

 Security issues
 ===============
@ -1102,8 +1173,8 @@ The following are some security issues that have been taken into consideration:
    When using PAM for authentication all clients are required to use
    TLS/SSL encryption.

-Security issues which relate to the SMTP protocol itself are beyond the scope of
-this document, but RFC-2821 makes the following observation: "SMTP mail is
+Security issues which relate to the SMTP protocol itself are beyond the scope
+of this document, but RFC-2821_ makes the following observation: "SMTP mail is
 inherently insecure in that it is feasible for even [..] casual users to [..]
 create messages that will trick a [..] recipient into believing that they came
 from somewhere else. [..] Real [..] security lies [..] in end-to-end methods
@ -1168,6 +1239,7 @@ Installation directories can be defined at build-time by the following
 * e_pamdir=\<dir\>
 * e_spooldir=\<dir\>
 * e_sysconfdir=\<dir\>
+* e_rundir=\<dir\>

 These are all defaulted to paths that are ultimately based on *--prefix*, so
 *./configure --prefix=$HOME* will work as expected.
@ -1177,7 +1249,7 @@ command:

 ::

-    ./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d
+    ./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d e_rundir=/run/emailrelay

 It is possible to change the installation root directory after building by
 using *make DESTDIR=<root> install* or *DESTDIR=<root> make -e install*.
@ -1193,12 +1265,19 @@ and these default to *%ProgramFiles%/E-MailRelay* for programs and



+.. _DNSBL: https://en.wikipedia.org/wiki/DNSBL
 .. _FHS: https://wiki.linuxfoundation.org/lsb/fhs
 .. _MTA: https://en.wikipedia.org/wiki/Message_transfer_agent
 .. _PAM: https://en.wikipedia.org/wiki/Linux_PAM
 .. _POP: https://en.wikipedia.org/wiki/Post_Office_Protocol
+.. _RFC-1891: https://tools.ietf.org/html/rfc1891
+.. _RFC-1918: https://tools.ietf.org/html/rfc1918
+.. _RFC-2821: https://tools.ietf.org/html/rfc2821
+.. _RFC-3461: https://tools.ietf.org/html/rfc3461
+.. _RFC-4013: https://tools.ietf.org/html/rfc4013
+.. _RFC-822: https://tools.ietf.org/html/rfc822
 .. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol
 .. _SOCKS: https://en.wikipedia.org/wiki/SOCKS
 .. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security

-.. footer:: Copyright (C) 2001-2018 Graeme Walker
+.. footer:: Copyright (C) 2001-2019 Graeme Walker
--- a/doc/reference.txt
+++ b/doc/reference.txt
@ -55,13 +55,20 @@ where <option> is:
  the remote server does not support SMTP authentication then the SMTP
  connection will fail.

+# --client-auth-config <config>
+  Configures the SMTP client authentication module using a  semicolon-separated
+  list of configuration items. Each item is a  single-character key, followed
+  by a colon and then a comma-separated  list. A 'm' character introduces an
+  ordered list of authentication  mechanisms, and an 'x' is used for
+  blocklisted mechanisms.
+
 # --client-filter <program> (-Y)
  Runs the specified external filter program whenever a mail message is
  forwarded. The filter is passed the name of the message file in the spool
  directory so that it can edit it as required. A network filter can be
-  specified as "net:<transport-address>" and prefixes of "spam:" and "exit:"
-  are also allowed. The "--filter" option is normally more useful than
-  "--client-filter".
+  specified as "net:<transport-address>" and prefixes of "spam:",
+  "spam-edit:" and "exit:" are also allowed. The "--filter" option is
+  normally more useful than "--client-filter".

 # --client-interface <ip-address> (-6)
  Specifies the IP network address to be used to bind the local end of outgoing
@ -117,10 +124,16 @@ where <option> is:
  useful when cross-referenced with the source code and they may expose
  plaintext passwords and mail message content.

+# --dnsbl <config>
+  Specifies a list of DNSBL servers that are used to reject SMTP	connections
+  from blocked addresses. The configuration string is made up of
+  comma-separated fields: the DNS server's transport address, a timeout in
+  milliseconds, a rejection threshold, and then the list of DNSBL servers.
+
 # --domain <fqdn> (-D)
  Specifies the network name that is used in SMTP EHLO commands, "Received"
-  lines, and for generating authentication challenges. The default network
-  name it derived from a DNS lookup of the local hostname.
+  lines, and for generating authentication challenges. The default is derived
+  from a DNS lookup of the local hostname.

 # --dont-serve (-x)
  Disables all network serving, including SMTP, POP and administration
@ -133,8 +146,10 @@ where <option> is:
  that it can edit it as required. The mail message is rejected if the filter
  program terminates with an exit code between 1 and 99. Use
  "net:<transport-address>" to communicate with a filter daemon over the
-  network, or "spam:<transport-address>" to talk to a spamassassin spamd
-  daemon, or "exit:<number>" to emulate a filter program that just exits.
+  network, or "spam:<transport-address>" for a spamassassin spamd daemon to
+  accept or reject mail messages, or  "spam-edit:<transport-address>" to have
+  spamassassin edit the message  content without rejecting it, or
+  "exit:<number>" to emulate a filter  program that just exits.

 # --filter-timeout <time> (-W)
  Specifies a timeout (in seconds) for running a "--filter" program. The
@ -159,9 +174,13 @@ where <option> is:
  Windows only. Hides the application window and disables all message boxes.
  This is useful when running as a windows service.

+# --idle-timeout <time>
+  Specifies a timeout (in seconds) for receiving network traffic from  remote
+  SMTP and POP clients. The default is 1800 seconds.
+
 # --immediate (-m)
-  Causes mail messages to be forwarded as soon as they are submitted, even
-  before they are accepted. This can be used to do proxying without
+  Causes mail messages to be forwarded as they are received, even before	they
+  have been accepted. This can be used to do proxying without
  store-and-forward, but in practice clients tend to to time out while
  waiting for their mail message to be accepted.

@ -214,7 +233,7 @@ where <option> is:

 # --pop (-B)
  Enables the POP server listening, by default on port 110, providing access to
-  spooled mail messages. Negotiated TLS using the POP3 "STLS" command will be
+  spooled mail messages. Negotiated TLS using the POP "STLS" command will be
  enabled if the "--server-tls" option is also given.

 # --pop-auth <file> (-F)
@ -227,10 +246,10 @@ where <option> is:
  Modifies the spool directory used by the POP server to be a sub-directory
  with the same name as the POP authentication user-id. This allows multiple
  POP clients to read the spooled messages without interfering with each
-  other. Content files can stay in the main spool directory with the envelope
-  files copied into user-specific sub-directories. The
-  "emailrelay-filter-copy" program is a convenient way of doing this when run
-  via "--filter".
+  other, particularly when also  using "--pop-no-delete". Content files can
+  stay in the main spool  directory with only the envelope files copied into
+  user-specific  sub-directories. The "emailrelay-filter-copy" program is a
+  convenient way of doing this when run via "--filter".

 # --pop-no-delete (-G)
  Disables the POP DELE command so that the command appears to succeed but mail
@ -267,6 +286,13 @@ where <option> is:
  xtext encoded or generated by "emailrelay-passwd". A special value of
  "/pam" can be used for authentication using linux PAM.

+# --server-auth-config <config>
+  Configures the SMTP server authentication module using a  semicolon-separated
+  list of configuration items. Each item is a  single-character key, followed
+  by a colon and then a comma-separated  list. A 'm' character introduces a
+  preferred sub-set of the built-in  authentication mechanisms, and an 'x' is
+  used for blocklisted	mechanisms.
+
 # --server-tls (-K)
  Enables TLS for incoming SMTP and POP connections. SMTP clients can then
  request TLS encryption by issuing the STARTTLS command. The
@ -312,7 +338,7 @@ where <option> is:
 # --user <username> (-u)
  When started as root the program switches to an non-privileged effective
  user-id when idle. This option can be used to define which user-id is used.
-  Ignored on Windows.
+  Specify "root" to disable all user-id switching. Ignored on Windows.

 # --verbose (-v)
  Enables more verbose logging when used with "--log", and more verbose help
@ -322,7 +348,7 @@ where <option> is:
  Displays version information and then exits.

 A configuration file can be used to provide additional options; put each
-options on a separate line, use the long option names but without the double
+option on a separate line, use the long option names but without the double
 dash, and separate the option name from the option value with spaces.

 All command-line options that specify a filename can use a special "@app"
@ -332,9 +358,9 @@ the "emailrelay" executable or MacOS application bundle.
 Message store
 -------------
 Mail messages are stored as text files in the configured spool directory. Each
-e-mail message is represented as an envelope file and a content file. The envelope
-file contains parameters relevant to the SMTP dialogue, and the content file
-contains the RFC-822 headers and body text.
+e-mail message is represented as an envelope file and a content file. The
+envelope file contains parameters relevant to the SMTP dialogue, and the
+content file contains the RFC-822 headers and body text.

 The filenames used in the message store have a prefix of "emailrelay", followed
 by a process-id, timestamp and sequence number, and then "envelope" or
@ -379,8 +405,8 @@ Mail processing
 The "--filter" command-line option allows you to specify a mail processing
 program which operates on e-mail messages as they pass through the E-MailRelay
 system. The filter program is run as soon as the e-mail message has been stored
-in the spool directory, with the full path of the content file added onto the
-end of the given command-line.
+in the spool directory, with the full path of the content file and envelope
+file put on the command-line.

 For example, the following command will start a proxy server on port 587
 which processes mail using the specified filter program, and then forwards the
@ -412,9 +438,10 @@ message use an exit code of 100.

 If the filter program creates completely new e-mail messages in the spool
 directory then they may not be processed immediately, or they may be completely
-ignored.  To get E-MailRelay to pick up any new messages you create in the spool
-directory use the special 103 exit code, or rely on the "--poll" mechanism, or
-perhaps run "emailrelay --as-client" from within the filter program.
+ignored.  To get E-MailRelay to pick up any new messages you create in the
+spool directory use the special 103 exit code, or rely on the "--poll"
+mechanism, or perhaps run "emailrelay --as-client" from within the filter
+program.

 As an example of a simple filter program processor this shell script examines
 the sending client's IP address and conditionally passes the message into
@ -423,7 +450,7 @@ the sending client's IP address and conditionally passes the message into
 	#!/bin/sh
 	# filter.sh
 	content="${1}"
-	envelope="`echo \"${content}\" | sed 's/content/envelope.new/'`"
+	envelope="${2}"
 	ip="`awk '/MailRelay-Client:/ {print $2;exit}' \"${envelope}\"`"
 	if test "${ip}" = "192.168.0.2"
 	then
@ -445,7 +472,7 @@ For Windows this example can be rewritten in JavaScript:

 	// filter.js
 	var content = WScript.Arguments(0) ;
-	var envelope = content.substr(0,content.length-7) + "envelope.new" ;
+	var envelope = WScript.Arguments(1) ;
 	var fs = WScript.CreateObject( "Scripting.FileSystemObject" ) ;
 	var ts = fs.OpenTextFile( envelope , 1 , false ) ;
 	var e = ts.ReadAll() ;
@ -472,30 +499,33 @@ Either forward-slashes or back-slashes can be used.

 E-MailRelay also has a "--client-filter" option that enables processing of
 e-mail messages just before they are forwarded, rather than after they are
-stored. The disadvantage is that by then it is too late to notify the submitting
-SMTP client of any processing failures, so in many store-and-forward
+stored. The disadvantage is that by then it is too late to notify the
+submitting SMTP client of any processing failures, so in many store-and-forward
 applications using "--filter" is more useful. The special exit code of 100 can
-be used to ignore the current message, and 102 to stop scanning for more spooled
-messages after processing the current one (eg. for simple rate-limiting).
+be used to ignore the current message, and 102 to stop scanning for more
+spooled messages after processing the current one (eg. for simple
+rate-limiting).

 Bear in mind the following points when writing "--filter" programs:

-* The standard input and output are not used; the content filename is passed on the command-line.
+* The standard input and output are not used; the message filename is passed on the command-line.
 * Programs are run with a reduced set of environment variables.
 * E-MailRelay files use CR-LF line terminators, as required by the RFCs.
 * Envelope files will have a file extension of ".new" or ".busy" when the program runs.
 * Windows scripts may need to be run via "cscript" or a batch file wrapper.

 It is also possible to do message filtering in a separate process by using
-"net:<transport-address>" as the "--filter" or "--client-filter" option parameter.
-E-MailRelay connects to this address and then uses a simple line-based dialog as
-each e-mail message is processed where it sends the full path of the message
+"net:<tcp-address>" as the "--filter" or "--client-filter" option parameter.
+E-MailRelay connects to this address and then uses a simple line-based dialog
+as each e-mail message is processed: it sends the full path of the message
 content file in one line and expects the remote process to respond with an "ok"
-line if the message is to be accepted or an error message.
+line if the message is to be accepted or an error message. If the error message
+contains a tab character then anything after the tab character is logged but
+otherwise ignored.

-Alternatively, use "spam:<transport-address>" for connecting to a SpamAssassim
-"spamd" server, or use "exit:<exit-code>" for simulating a filter program
-that just does an exit with the specified exit code.
+Alternatively, use "spam:<tcp-address>" or "spam-edit:<tcp-address>" to connect
+to a SpamAssassim "spamd" server, or use "exit:<exit-code>" for simulating a
+filter program that just does an exit with the specified exit code.

 Authentication
 --------------
@ -511,12 +541,12 @@ usernames and passwords:
 	emailrelay --as-client=example.com:smtp --client-auth=/etc/emailrelay-server.auth

 The client-side secrets file specified with "--client-auth" is used when
-E-MailRelay acts as a client to talk to a remote server. The file should contain
-at least one "client" entry.
+E-MailRelay acts as a client to talk to a remote server. The file should
+contain at least one "client" entry.

 The server-side secrets file specified with "--server-auth" is used when a
-remote client tries to authenticate with the E-MailRelay server. The file should
-normally contain several "server" entries, one for each remote client.
+remote client tries to authenticate with the E-MailRelay server. The file
+should normally contain several "server" entries, one for each remote client.

 <<authentication.png>>

@ -534,16 +564,18 @@ Lines have four white-space delimited fields:
 * "password"

 The "client-or-server" field must be "client" or "server"; the "password-type"
-field must be "plain" or "md5"; the "userid" field is xtext-encoded
+field should be "plain" or "md5"; the "userid" field is xtext-encoded
 user identifier; and the "password" field is the xtext-encoded plain password
 or a base64-encoded "HMAC-MD5" state. For "client" lines the password-type can
 also be "oauth".

 The first two fields are case-insensitive. The "xtext" encoding scheme is
-defined properly in RFC-1891, but basically it says that non-alphanumeric
+defined properly in RFC-3461, but basically it says that non-alphanumeric
 characters (including space, "+", "#" and "=") should be represented in
 uppercase hexadecimal ascii as "+XX". So a space should be written as "+20";
-"+" as "+2B"; "#" as "+23"; and "=" as "+3D".
+"+" as "+2B"; "#" as "+23"; and "=" as "+3D". Also note that modern email
+services will expect userids and passwords containing non-ASCII characters to
+use UTF-8 encoding with RFC-4013 normalisation applied.

 Authentication proceeds according to an authentication 'mechanism' that is
 advertised by the server and selected by the client. Many authentication
@ -590,12 +622,13 @@ When the "--server-auth" option is used clients must authenticate with the
 E-MailRelay server but it is possible to configure some client IP addresses as
 'trusted' so that connections from these addresses do not have to authenticate.

-Trusted IP addresses are configured with lines in the secrets file having "server"
-in the first field, "none" in the second field, a wildcarded IP address in
-the third field, and an arbitrary keyword in the fourth field. The keyword field
-is passed to any external address verifier program specified by the
-"--address-verifier" command-line option; it is not used for any other purpose.
-Wildcarded IPv4 addresses can use a format like 192.168.0.0/24 or 192.168.0.*.
+Trusted IP addresses are configured with lines in the secrets file having
+"server" in the first field, "none" in the second field, a wildcarded IP
+address in the third field, and an arbitrary keyword in the fourth field. The
+keyword field is passed to any external address verifier program specified by
+the "--address-verifier" command-line option; it is not used for any other
+purpose. Wildcarded IPv4 addresses can use a format like 192.168.0.0/24 or
+192.168.0.*.

 For example, this secrets file allows any client connecting over IPv4 from the
 192.168.0.0/24 address range, or over IPv6 from the fe80::/64 or fc00::/7
@ -610,12 +643,13 @@ ranges, to connect without authentication:
 	server plain carol my+20password

 On the client side, authentication is performed when E-MailRelay connects to a
-server which implements the SMTP AUTH extension with one of the supported
-mechanisms. If the remote server does not support the AUTH extension, or does not
-support mechanisms for which E-MailRelay has secrets, then an error will be
-logged and no messages will be forward.
+server that implements the SMTP AUTH extension with one of the supported
+mechanisms. If client-side authentication is required but the remote server
+does not support the AUTH extension, or does not support mechanisms for which
+E-MailRelay has secrets, then an error will be logged and no messages will be
+forwarded.

-When E-MailRelay successfully authenticates with the remote server the session
+When E-MailRelay successfully authenticates with the remote server the
 authentication name is passed as the AUTH parameter of the SMTP MAIL FROM
 command, ignoring any AUTH name from the original submission. This default
 policy can be modified by editing the "MailFromAuthOut" field in the message
@ -636,8 +670,9 @@ connections start off as unencrypted and the SMTP command "STARTTLS" (or the
 POP "STLS" command) can be used to negotiate TLS encryption before any
 passwords are exchanged.

-The "--server-tls" option requires that the "--server-tls-certificate" option is
-used to specify a PEM-format file containing a X.509 certificate and private key.
+The "--server-tls" option requires that the "--server-tls-certificate" option
+is used to specify a PEM-format file containing a X.509 certificate and private
+key.

 This OpenSSL command can be used to create a self-signed certificate file
 suitable for testing:
@ -653,8 +688,8 @@ options for more details.

 E-MailRelay can also make outgoing SMTP connections using TLS encryption where
 the whole SMTP dialog is encrypted from the start ("--client-tls-connection").
-This is sometimes called SMTP-over-TLS or secure SMTP (smtps) and it is normally
-used with port number 465.
+This is sometimes called SMTP-over-TLS or secure SMTP (smtps) or implicit TLS
+and it is normally used with port number 465.

 PAM Authentication
 ------------------
@ -684,8 +719,8 @@ account names and passwords to authenticate remote clients. On some systems
 this will require special permissioning to allow the E-MailRelay server to
 read the shadow password database.

-When using PAM authentication E-MailRelay requires that remote clients establish
-an encrypted session using TLS before authentication can proceed.
+When using PAM authentication E-MailRelay requires that remote clients
+establish an encrypted session using TLS before authentication can proceed.

 IP addresses
 ------------
@ -699,8 +734,8 @@ option then that address is used for listening.
 Eg:
 	--interface 127.0.0.1

-If the "--client-interface" option is used then that address is used to bind the
-local end of outgoing SMTP client connections.
+If the "--client-interface" option is used then that address is used to bind
+the local end of outgoing SMTP client connections.

 Eg:
 	--client-interface 192.168.0.1
@ -723,8 +758,8 @@ The IPv4 and IPv6 wildcard addresses ("0.0.0.0" and "::") can be used with
 "--interface" and "--client-interface" to enable the use of IPv4 only or IPv6
 only.

-To use IPv4 only for incoming connections use "--interface 0.0.0.0"; for IPv6 only
-on incoming connections use "--interface ::".
+To use IPv4 only for incoming connections use "--interface 0.0.0.0"; for IPv6
+only on incoming connections use "--interface ::".

 	--interface 0.0.0.0 # IPv4 only
 	--interface ::      # IPv6 only
@ -736,8 +771,8 @@ for IPv6 only on outgoing SMTP connections use "--client-interface ::".
 	--client-interface ::      # IPv6 only

 Hostnames given in the "--forward-to", "--as-proxy" and "--as-client" options
-are resolved to IPv4 addresses and/or IPv6 addresses using DNS. If both IPv4 and
-IPv6 records are returned from the DNS query then the "--client-interface"
+are resolved to IPv4 addresses and/or IPv6 addresses using DNS. If both IPv4
+and IPv6 records are returned from the DNS query then the "--client-interface"
 option can be used to select either the IPv4 or IPv6 results. Otherwise the
 first address is used, whether that is IPv4 or IPv6.

@ -747,9 +782,9 @@ Eg:

 SOCKS
 -----
-E-MailRelay can use a SOCKS 4a proxy for establishing outgoing SMTP connections;
-just append the SOCKS proxy address to the SMTP server's address, separated by
-"@".
+E-MailRelay can use a SOCKS 4a proxy for establishing outgoing SMTP
+connections; just append the SOCKS proxy address to the SMTP server's address,
+separated by "@".

 For example, this could be used to send e-mails via the Tor network, assuming
 there is a local Tor node running on port 9050:
@ -777,13 +812,13 @@ mechanism used by the client (if any, and "none" if trusted), and (6) either
 the authentication name or the fourth field from authentication secrets file
 if a trusted IP address.

-So, for example, a verifier program called "myverifier" might be run with the
-following command-line:
+So, for example, a verifier program called "myverifier" might be run as if with
+the following command-line:

 	myverifier bob@local.net alice@example.com 192.168.0.1:123 local.net login alice

-The verifier program is expected to generate two lines of output on the standard
-output stream and then terminate with a specific exit code.
+The verifier program is expected to generate two lines of output on the
+standard output stream and then terminate with a specific exit code.

 For future-proofing a verifier must report a version number of "2.0" if called
 with a command-line starting with "--emailrelay-version".
@ -809,9 +844,11 @@ name -- and then exit with a value of zero.
 	echo postmaster
 	exit 0

-For E-MailRelay local delivery just means that the message file in the spool
-directory is given a ".local" filename suffix. This can be used to create a
-separate channel for administrative messages such as delivery reports.
+For E-MailRelay local delivery just means that the message files in the spool
+directory are copied to files with a ".local" filename suffix. If all the
+envelope recipients are local-mailboxes then no normal message files are
+created. This mechanism can be used to create a separate channel for
+administrative messages such as delivery reports.

 For invalid addresses the exit value should be non-zero and the first line
 of output is the error response.
@ -835,8 +872,8 @@ which may be useful in limiting the impact of denial of service attacks:
 	# address verifier -- abort
 	exit 100

-In this more complete example the verifier script accepts all addresses as valid
-as long as they contain an "at" character:
+In this more complete example the verifier script accepts all addresses as
+valid as long as they contain an "at" character:

 	#!/bin/sh
 	# address verifier -- accept only if containing an at sign
@ -896,16 +933,44 @@ or written in JavaScript for Windows:
 	    WScript.Quit( 3 ) ;
 	}

-If this verifier script is used with a suitable "--server-auth" file then it can
-be used to prevent open relay without restricting authenticated clients.
+If this verifier script is used with a suitable "--server-auth" file then it
+can be used to prevent open relay without restricting authenticated clients.

 It is also possible to verify addresses in a separate daemon process by using a
-"--address-verifier" option of the form "net:<transport-address>". In this case
+"--address-verifier" option of the form "net:<tcp-address>". In this case
 E-MailRelay will connect to the specified verifier daemon over the network and
 send address verification requests as lines with pipe-delimited fields. The
-expected response is another pipe-delimited line containing the same information
-as returned by verifier scripts but in reverse, such as "3|address unavailable"
-or "0|postmaster|Local Postmaster <postmaster@localhost>".
+expected response is another pipe-delimited line containing the same
+information as returned by verifier scripts but in reverse, such as
+"3|address unavailable" or "0|postmaster|Local Postmaster <postmaster@eg.com>".
+
+Connection blocking
+-------------------
+All incoming connections from remote network addresses are blocked by default,
+but can be allowed by using the "--remote-clients"/"-r" option. This is to
+guard against accidental exposure to the internet.
+
+Incoming SMTP connections can also be checked against DNSBL blocklists in order
+to block connections from known spammers. Use the "--dnsbl" option to define a
+list of DNSBL servers, together with a rejection threshold. If the threshold
+number of servers 'deny' the incoming connection's network address then
+E-MailRelay will drop the connection immediately.
+
+The "--dnsbl" configuration starts with the DNS server network address and a
+millisond timeout, followed by the threshold and list of servers:
+
+	emailrelay -r --dnsbl 1.1.1.1:53,500,1,spam.example.com,block.example.com ...
+
+A threshold of zero means that the DNSBL servers are consulted but connections
+are always allowed. This can be combined with verbose logging ("--log -v")
+for initial testing.
+
+If the timeout period expires before a collective decision is reached then the
+connection is allowed. This default behaviour can be changed by using a negative
+timeout, but for finer control use a DNSBL proxy.
+
+Connections from loopback and private (RFC-1918) network addresses are never
+checked.

 Security issues
 ---------------
@ -978,8 +1043,8 @@ The following are some security issues that have been taken into consideration:
  When using PAM for authentication all clients are required to use
  TLS/SSL encryption.

-Security issues which relate to the SMTP protocol itself are beyond the scope of
-this document, but RFC-2821 makes the following observation: "SMTP mail is
+Security issues which relate to the SMTP protocol itself are beyond the scope
+of this document, but RFC-2821 makes the following observation: "SMTP mail is
 inherently insecure in that it is feasible for even [..] casual users to [..]
 create messages that will trick a [..] recipient into believing that they came
 from somewhere else. [..] Real [..] security lies [..] in end-to-end methods
@ -1041,6 +1106,7 @@ Installation directories can be defined at build-time by the following
 * e_pamdir=<dir>
 * e_spooldir=<dir>
 * e_sysconfdir=<dir>
+* e_rundir=<dir>

 These are all defaulted to paths that are ultimately based on "--prefix", so
 "./configure --prefix=$HOME" will work as expected.
@ -1048,7 +1114,7 @@ These are all defaulted to paths that are ultimately based on "--prefix", so
 For a directory structure conforming more closely to the FHS use this configure
 command:

-	./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d
+	./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d e_rundir=/run/emailrelay

 It is possible to change the installation root directory after building by
 using "make DESTDIR=<root> install" or "DESTDIR=<root> make -e install".
@ -1063,4 +1129,4 @@ and these default to "%ProgramFiles%/E-MailRelay" for programs and


 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/serverclient.svg
+++ b/doc/serverclient.svg
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
--- a/doc/userguide.html
+++ b/doc/userguide.html
@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "%-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
  <title>E-MailRelay User Guide</title>
@ -79,9 +79,9 @@
    </p>
   <h2><a class="a-header" name="SH_1_4">Running E-MailRelay</a></h2> <!-- index:2:SH:1:4:Running E-MailRelay -->
    <p>
-     To use E-MailRelay in store-and-forward mode use the <em class="quote">--as-server</em> option to
+     To use E-MailRelay in store-and-forward mode use the <em>--as-server</em> option to
     start the storage daemon in the background, and then do delivery of spooled
-     messages by running with the <em class="quote">--as-client</em> option.
+     messages by running with the <em>--as-client</em> option.
    </p>

 <img src="serverclient.png" alt="image">
@ -97,7 +97,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     And then to forward the spooled mail to <em class="quote">smtp.example.com</em> run something
+     And then to forward the spooled mail to <em>smtp.example.com</em> run something
     like this:
    </p>

@ -106,7 +106,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     To get behaviour more like a proxy you can add the <em class="quote">--poll</em> and <em class="quote">--forward-to</em>
+     To get behaviour more like a proxy you can add the <em>--poll</em> and <em>--forward-to</em>
     options so that messages are forwarded continuously rather than on-demand.
    </p>

@ -124,7 +124,7 @@
      </div><!-- div-pre -->
    <p>
     Or for a proxy server that forwards each message soon after it has been
-     received, you can use <em class="quote">--as-proxy</em> or add <em class="quote">--forward-on-disconnect</em>:
+     received, you can use <em>--as-proxy</em> or add <em>--forward-on-disconnect</em>:
    </p>

      <div class="div-pre">
@ -133,7 +133,7 @@
      </div><!-- div-pre -->
    <p>
     To edit or filter e-mail as it passes through the proxy specify your filter
-     program with the <em class="quote">--filter</em> option, something like this:
+     program with the <em>--filter</em> option, something like this:
    </p>

      <div class="div-pre">
@ -141,7 +141,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     To run E-MailRelay as a POP server without SMTP use <em class="quote">--pop</em> and <em class="quote">--no-smtp</em>:
+     To run E-MailRelay as a POP server without SMTP use <em>--pop</em> and <em>--no-smtp</em>:
    </p>

      <div class="div-pre">
@ -149,13 +149,13 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     The <em class="quote">emailrelay-submit</em> utility can be used to put messages straight into the
+     The <em>emailrelay-submit</em> utility can be used to put messages straight into the
     spool directory so that the POP clients can fetch them.
    </p>

    <p>
     By default E-MailRelay will always reject connections from remote machines. To
-     allow connections from anywhere use the <em class="quote">--remote-clients</em> option, but please
+     allow connections from anywhere use the <em>--remote-clients</em> option, but please
     check your firewall settings to make sure this cannot be exploited by spammers.
    </p>

@ -169,14 +169,14 @@
      </div><!-- div-pre -->
   <h2><a class="a-header" name="SH_1_5">Configuration</a></h2> <!-- index:2:SH:1:5:Configuration -->
    <p>
-     The <em class="quote">emailrelay</em> program itself is mostly configured through command-line
-     options (such as <em class="quote">--port</em> and <em class="quote">--forward-to</em>).
+     The <em>emailrelay</em> program itself is mostly configured through command-line
+     options (such as <em>--port</em> and <em>--forward-to</em>).
    </p>

    <p>
     In most installations on Unix-like system the E-MailRelay server will be
-     started up by the boot-time script called <em class="quote">emailrelay</em> in the <em class="quote">/etc/init.d</em>
-     directory, and this script uses the configuration file <em class="quote">/etc/emailrelay.conf</em> to
+     started up by the boot-time script called <em>emailrelay</em> in the <em>/etc/init.d</em>
+     directory, and this script uses the configuration file <em>/etc/emailrelay.conf</em> to
     define the server command-line. Each entry in the configuration file corresponds
     to an E-MailRelay command-line option, so you can edit this file to add and
     remove server options. Refer to the reference guide for a complete list of
@ -185,7 +185,7 @@

    <p>
     On Windows the installation program creates a startup batch file called
-     <em class="quote">emailrelay-start.bat</em> that contains all the server command-line options and
+     <em>emailrelay-start.bat</em> that contains all the server command-line options and
     you can edit this file to change the server configuration. You can also set up
     your own shortcuts to the E-MailRelay executable and add and remove command-line
     options using the shortcut properties tab.
@ -194,35 +194,35 @@
    <p>
     If you are using authentication then you will have to create the text files
     containing your authentication secrets (account names, passwords and password
-     hashes). The <em class="quote">--server-auth</em>, <em class="quote">--client-auth</em> and <em class="quote">--pop-auth</em> command-line
+     hashes). The <em>--server-auth</em>, <em>--client-auth</em> and <em>--pop-auth</em> command-line
     options are used to point to these files.
    </p>

    <p>
-     There is also a graphical configuration program called <em class="quote">emailrelay-gui</em> that
+     There is also a graphical configuration program called <em>emailrelay-gui</em> that
     may be available to help with configuring the system. This is mostly intended
     to be used once at installation time since it is the basis of the Windows
     installer, but it can also be used to do some simple reconfiguration of an
     already-installed system. It takes you through a sequence of configuration
     pages and then on the last page creates or updates the configuration files, ie.
-     the authentication secrets file and the configuration file <em class="quote">emailrelay.conf</em>
-     or <em class="quote">emailrelay-start.bat</em>.
+     the authentication secrets file and the configuration file <em>emailrelay.conf</em>
+     or <em>emailrelay-start.bat</em>.
    </p>
   <h2><a class="a-header" name="SH_1_6">Logging</a></h2> <!-- index:2:SH:1:6:Logging -->
    <p>
-     If the <em class="quote">--log</em> option is used then E-MailRelay program sends warnings and error
-     messages to its standard error stream, and to the <em class="quote">syslog</em> system on Unix or
+     If the <em>--log</em> option is used then E-MailRelay program sends warnings and error
+     messages to its standard error stream, and to the <em>syslog</em> system on Unix or
     to the Event Viewer on Windows.
    </p>

    <p>
     The standard error stream logging can be redirected to a file by using the
-     <em class="quote">--log-file</em> option, and daily log files can be created by using <em class="quote">%d</em> in the
+     <em>--log-file</em> option, and daily log files can be created by using <em>%d</em> in the
     filename.
    </p>

    <p>
-     For more verbose logging add the <em class="quote">--verbose</em> option to the command-line.
+     For more verbose logging add the <em>--verbose</em> option to the command-line.
    </p>
   <h2><a class="a-header" name="SH_1_7">Preventing open mail relay</a></h2> <!-- index:2:SH:1:7:Preventing open mail relay -->
    <p>
@ -230,25 +230,25 @@
     internet it is important to prevent open mail relay because this can be
     exploited by spammers and get you into trouble with your ISP. By default open
     mail relaying is not possible because E-MailRelay does not accept IP connections
-     from remote clients. However, if you use the <em class="quote">--remote-clients</em> option then you
+     from remote clients. However, if you use the <em>--remote-clients</em> option then you
     need to be more careful.
    </p>

    <p>
     If the only required access to the E-MailRelay server is from a local network
     and not from the internet then just set up your firewall to block incoming
-     connections on ports 25 (SMTP) and 110 (POP) and also use the <em class="quote">--interface</em>
+     connections on ports 25 (SMTP) and 110 (POP) and also use the <em>--interface</em>
     option on the E-MailRelay command-line so that it only listens for incoming
     connections on the local network.
    </p>

    <p>
     If you do need to accept connections from the internet then you should require
-     all clients to authenticate themselves by using the <em class="quote">--server-auth</em> option on
+     all clients to authenticate themselves by using the <em>--server-auth</em> option on
     the E-MailRelay command-line. If you also want local clients running on your
     internal network to be able to bypass this authentication then you can put those
     trusted IP addresses in the E-MailRelay secrets file with an authentication
-     mechanism of <em class="quote">none</em>. Refer to the reference guide for more information.
+     mechanism of <em>none</em>. Refer to the reference guide for more information.
    </p>
   <h2><a class="a-header" name="SH_1_8">Running as a POP server</a></h2> <!-- index:2:SH:1:8:Running as a POP server -->
    <p>
@ -265,7 +265,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     You will need to create the authentication secrets file (<em class="quote">emailrelay.auth</em> in
+     You will need to create the authentication secrets file (<em>emailrelay.auth</em> in
     this example) containing usernames and passwords. A simple example would look
     like this:
    </p>
@ -278,33 +278,33 @@ server plain user2 password2
    <p>
     It can sometimes be useful to serve up the same e-mail messages to multiple POP
     clients. For example, you might use several e-mail clients on your local network
-     and you would like to see your mail on all of them equally. The <em class="quote">--pop-by-name</em>
+     and you would like to see your mail on all of them equally. The <em>--pop-by-name</em>
     option is intended to be used in this scenario; each e-mail client sees its own
     copy of the e-mail messages, stored in its own sub-directory of the main spool
     directory. The name of the sub-directory is simply the name that the client uses
     to authenticate with the E-MailRelay server. You just need to create the
-     sub-directory for each client and then specify <em class="quote">emailrelay-filter-copy</em>
-     as the <em class="quote">--filter</em> program.
+     sub-directory for each client and then specify <em>emailrelay-filter-copy</em>
+     as the <em>--filter</em> program.
    </p>

    <p>
-     Refer to the documentation of the various <em class="quote">--pop</em> command-line options for
-     more detail: <em class="quote">--pop</em>, <em class="quote">--pop-port</em>, <em class="quote">--pop-auth</em>, <em class="quote">--pop-no-delete</em> and
-     <em class="quote">--pop-by-name</em>.
+     Refer to the documentation of the various <em>--pop</em> command-line options for
+     more detail: <em>--pop</em>, <em>--pop-port</em>, <em>--pop-auth</em>, <em>--pop-no-delete</em> and
+     <em>--pop-by-name</em>.
    </p>
   <h2><a class="a-header" name="SH_1_9">Triggering delivery</a></h2> <!-- index:2:SH:1:9:Triggering delivery -->
    <p>
     If you are using E-MailRelay on Unix to store and forward e-mail over an
-     intermittent link to internet such as dial-up or wireless networking, then you
-     might need to set things up so that the network tells E-MailRelay when to start
-     forwarding e-mail.
+     intermittent link to the internet such as dial-up or wireless networking, then
+     you might need to set things up so that the network tells E-MailRelay when to
+     start forwarding e-mail.
    </p>

    <p>
     On Linux systems you should find that there are special directories where you
     can install your own hook scripts that are called whenever a dial-up or wireless
-     network connection is established. For dial-up this might be <em class="quote">/etc/ppp/ip-up.d</em>,
-     and for wireless <em class="quote">/etc/network/if-up.d</em>.
+     network connection is established. For dial-up this might be <em>/etc/ppp/ip-up.d</em>,
+     and for wireless <em>/etc/network/if-up.d</em>.
    </p>

    <p>
@ -317,23 +317,23 @@ exec /usr/local/sbin/emailrelay --as-client=smtp.example.com:smtp
 </pre>
      </div><!-- div-pre -->
    <p>
-     and make it executable using <em class="quote">chmod +x</em>.
+     and make it executable using <em>chmod +x</em>.
    </p>
   <h2><a class="a-header" name="SH_1_10">Failed e-mails</a></h2> <!-- index:2:SH:1:10:Failed e-mails -->
    <p>
     If e-mail messages cannot be forwarded by the E-MailRelay system then the
-     envelope files in the spool directory are given a <em class="quote">.bad</em> suffix. The reason for
+     envelope files in the spool directory are given a <em>.bad</em> suffix. The reason for
     the failure will be recorded in the envelope file itself.
    </p>

    <p>
-     You should check for <em class="quote">.bad</em> envelope files in the E-MailRelay spool directory
+     You should check for <em>.bad</em> envelope files in the E-MailRelay spool directory
     from time to time.
    </p>

    <p>
     If you want failed e-mails to be retried a few times you can run the
-     <em class="quote">emailrelay-resubmit</em> script periodically. This script simply removes the <em class="quote">.bad</em>
+     <em>emailrelay-resubmit</em> script periodically. This script simply removes the <em>.bad</em>
     suffix from files in the spool directory, as long as they have not been retried
     too many times already.
    </p>
@ -348,30 +348,30 @@ exec /usr/local/sbin/emailrelay --as-client=smtp.example.com:smtp

    <p>
     Remember that messages can be introduced directly into the E-MailRelay spool
-     directory using the <em class="quote">emailrelay-submit</em> utility, and they can be moved out again
+     directory using the <em>emailrelay-submit</em> utility, and they can be moved out again
     at any time, as long as the envelope file is not locked (ie. with a special
-     filename extension). Your <em class="quote">--filter</em> program can edit messages in any way you
+     filename extension). Your <em>--filter</em> program can edit messages in any way you
     want, and it can even delete the current message from the spool directory.
    </p>

    <p>
-     When using E-MailRelay as a POP server the <em class="quote">--pop-by-name</em> feature can be used
+     When using E-MailRelay as a POP server the <em>--pop-by-name</em> feature can be used
     to serve up different spooled messages according to the username that the
-     client authenticated with. Rather than use <em class="quote">emailrelay-filter-copy</em> to
+     client authenticated with. Rather than use <em>emailrelay-filter-copy</em> to
     distribute incoming e-mail messages into all subdirectories you could use a
     custom script to do it based on the message addressing.
    </p>

    <p>
     The POP server can also be used for checking e-mails that are taken out of the
-     normal store-and-forward flow. For example, a <em class="quote">--filter</em> script that checks for
+     normal store-and-forward flow. For example, a <em>--filter</em> script that checks for
     spam could move suspicious e-mails into a subdirectory of the spool directory
-     that is accessible via the <em class="quote">--pop-by-name</em> feature.
+     that is accessible via the <em>--pop-by-name</em> feature.
    </p>
   <h2><a class="a-header" name="SH_1_12">Rate limiting</a></h2> <!-- index:2:SH:1:12:Rate limiting -->
    <p>
     If you need to slow the rate at which e-mails are forwarded you can use a
-     <em class="quote">--client-filter</em> program to introduce a delay. On Windows this JavaScript
+     <em>--client-filter</em> program to introduce a delay. On Windows this JavaScript
     program would give you a delay of a minute:
    </p>

@ -382,18 +382,18 @@ WScript.Quit( 0 ) ;
      </div><!-- div-pre -->
    <p>
     However, this can cause timeouts at the server, so a better approach is to use
-     <em class="quote">--client-filter exit:102</em> so that only one e-mail message is forwarded on each
-     polling cycle, and then use <em class="quote">--poll 60</em> to limit it to one e-mail per minute.
+     <em>--client-filter exit:102</em> so that only one e-mail message is forwarded on each
+     polling cycle, and then use <em>--poll 60</em> to limit it to one e-mail per minute.
    </p>
   <h2><a class="a-header" name="SH_1_13">SpamAssassin</a></h2> <!-- index:2:SH:1:13:SpamAssassin -->
    <p>
-     The E-MailRelay server can use <a class="a-href" href="http://spamassassin.apache.org">SpamAssassin</a>
+     The E-MailRelay server can use <a href="http://spamassassin.apache.org">SpamAssassin</a>
     to mark or reject potential spam.
    </p>

    <p>
-     To get E-MailRelay to reject spam outright you can just use <em class="quote">spamassassin -e</em> as
-     your E-MailRelay <em class="quote">--filter</em> program:
+     To get E-MailRelay to reject spam outright you can just use <em>spamassassin -e</em> as
+     your E-MailRelay <em>--filter</em> program:
    </p>

      <div class="div-pre">
@ -410,18 +410,18 @@ WScript.Quit( 0 ) ;
      </div><!-- div-pre -->
    <p>
     To get spam messages identified by SpamAssassin but still pass through the
-     E-MailRelay system you will have to have a small <em class="quote">--filter</em> script to collect
-     the output from the <em class="quote">spamassassin</em> program and write it back into the
+     E-MailRelay system you will have to have a small <em>--filter</em> script to collect
+     the output from the <em>spamassassin</em> program and write it back into the
     E-MailRelay content file.
    </p>

    <p>
-     On Unix your <em class="quote">--filter</em> shell script could look something like this:
+     On Unix your <em>--filter</em> shell script could look something like this:
    </p>

      <div class="div-pre">
       <pre>#!/bin/sh
-spamassassin "$1" &gt; "$1.tmp"
+spamassassin "$1" > "$1.tmp"
 mv "$1.tmp" "$1"
 exit 0
 </pre>
@ -431,23 +431,23 @@ exit 0
    </p>

      <div class="div-pre">
-       <pre>c:\Program Files\perl\site\bin\spamassassin.bat %1 &gt; %1.tmp
+       <pre>c:\Program Files\perl\site\bin\spamassassin.bat %1 > %1.tmp
 ren %1.tmp %1
 exit 0
 </pre>
      </div><!-- div-pre -->
    <p>
-     E-MailRelay can also talk to a SpamAssassin <em class="quote">spamd</em> daemon over the network
-     by using <em class="quote">--filter spam:localhost:783</em>. This rejects the the message if
-     <em class="quote">spamd</em> thinks it is spam, or by using <em class="quote">--filter spam-edit:localhost:783</em>
+     E-MailRelay can also talk to a SpamAssassin <em>spamd</em> daemon over the network
+     by using <em>--filter spam:localhost:783</em>. This rejects the the message if
+     <em>spamd</em> thinks it is spam, or by using <em>--filter spam-edit:localhost:783</em>
     the message will be accepted but the content will be replaced by the
-     <em class="quote">spamd</em> output.
+     <em>spamd</em> output.
    </p>
   <h2><a class="a-header" name="SH_1_14">Google mail</a></h2> <!-- index:2:SH:1:14:Google mail -->
    <p>
     To send mail via Google mail's SMTP gateway you will need to create a client
     secrets file containing your account details and also enable TLS support in
-     E-MailRelay by using the <em class="quote">--client-tls</em> option.
+     E-MailRelay by using the <em>--client-tls</em> option.
    </p>

    <p>
@ -461,12 +461,12 @@ exit 0
    <p>
     If your password contains a space, equals or plus sign, or any control
     character then you will need to replace those characters with their
-     corresponding hexadecimal ascii value, something like <em class="quote">+20</em> or <em class="quote">+2B</em>.
+     corresponding hexadecimal ascii value, something like <em>+20</em> or <em>+2B</em>.
    </p>

    <p>
-     Refer to your secrets file by using <em class="quote">--client-auth</em> on the E-MailRelay
-     command-line, and also add in the <em class="quote">--client-tls</em> option:
+     Refer to your secrets file by using <em>--client-auth</em> on the E-MailRelay
+     command-line, and also add in the <em>--client-tls</em> option:
    </p>

      <div class="div-pre">
@ -475,7 +475,7 @@ exit 0
   <h2><a class="a-header" name="SH_1_15">Connection tunnelling</a></h2> <!-- index:2:SH:1:15:Connection tunnelling -->
    <p>
     E-MailRelay can send mail out via a SOCKS v4 proxy, which makes it easy to route
-     your mail through an encrypted tunnel using <em class="quote">ssh -N -D</em> or via the Tor
+     your mail through an encrypted tunnel created by <em>ssh -N -D</em> or via the Tor
     anonymising network.
    </p>

@ -493,10 +493,10 @@ exit 0
      </div><!-- div-pre -->
    <div class="div-footer">
     <p>
-      Copyright (C) 2001-2018 Graeme Walker
+      Copyright (C) 2001-2019 Graeme Walker
     </p>
    </div><!-- div-footer -->
 </div> <!-- div-main -->
 </body>
 </html>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/userguide.md
+++ b/doc/userguide.md
@ -207,9 +207,9 @@ more detail: `--pop`, `--pop-port`, `--pop-auth`, `--pop-no-delete` and
 Triggering delivery
 -------------------
 If you are using E-MailRelay on Unix to store and forward e-mail over an
-intermittent link to internet such as dial-up or wireless networking, then you
-might need to set things up so that the network tells E-MailRelay when to start
-forwarding e-mail.
+intermittent link to the internet such as dial-up or wireless networking, then
+you might need to set things up so that the network tells E-MailRelay when to
+start forwarding e-mail.

 On Linux systems you should find that there are special directories where you
 can install your own hook scripts that are called whenever a dial-up or wireless
@ -335,7 +335,7 @@ command-line, and also add in the `--client-tls` option:
 Connection tunnelling
 ---------------------
 E-MailRelay can send mail out via a [SOCKS][] v4 proxy, which makes it easy to route
-your mail through an encrypted tunnel using `ssh -N -D` or via the Tor
+your mail through an encrypted tunnel created by `ssh -N -D` or via the Tor
 anonymising network.

 For example, this will run an E-MailRelay proxy on port 587 that routes via a
@ -354,4 +354,4 @@ local Tor server on port 9050 to the mail server at smtp.example.com:
 [TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security

 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/userguide.rst
+++ b/doc/userguide.rst
@ -232,9 +232,9 @@ more detail: *--pop*, *--pop-port*, *--pop-auth*, *--pop-no-delete* and
 Triggering delivery
 ===================
 If you are using E-MailRelay on Unix to store and forward e-mail over an
-intermittent link to internet such as dial-up or wireless networking, then you
-might need to set things up so that the network tells E-MailRelay when to start
-forwarding e-mail.
+intermittent link to the internet such as dial-up or wireless networking, then
+you might need to set things up so that the network tells E-MailRelay when to
+start forwarding e-mail.

 On Linux systems you should find that there are special directories where you
 can install your own hook scripts that are called whenever a dial-up or wireless
@ -376,7 +376,7 @@ command-line, and also add in the *--client-tls* option:
 Connection tunnelling
 =====================
 E-MailRelay can send mail out via a SOCKS_ v4 proxy, which makes it easy to route
-your mail through an encrypted tunnel using *ssh -N -D* or via the Tor
+your mail through an encrypted tunnel created by *ssh -N -D* or via the Tor
 anonymising network.

 For example, this will run an E-MailRelay proxy on port 587 that routes via a
@ -397,4 +397,4 @@ local Tor server on port 9050 to the mail server at smtp.example.com:
 .. _SOCKS: https://en.wikipedia.org/wiki/SOCKS
 .. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security

-.. footer:: Copyright (C) 2001-2018 Graeme Walker
+.. footer:: Copyright (C) 2001-2019 Graeme Walker
--- a/doc/userguide.txt
+++ b/doc/userguide.txt
@ -206,9 +206,9 @@ more detail: "--pop", "--pop-port", "--pop-auth", "--pop-no-delete" and
 Triggering delivery
 -------------------
 If you are using E-MailRelay on Unix to store and forward e-mail over an
-intermittent link to internet such as dial-up or wireless networking, then you
-might need to set things up so that the network tells E-MailRelay when to start
-forwarding e-mail.
+intermittent link to the internet such as dial-up or wireless networking, then
+you might need to set things up so that the network tells E-MailRelay when to
+start forwarding e-mail.

 On Linux systems you should find that there are special directories where you
 can install your own hook scripts that are called whenever a dial-up or wireless
@ -334,7 +334,7 @@ command-line, and also add in the "--client-tls" option:
 Connection tunnelling
 ---------------------
 E-MailRelay can send mail out via a SOCKS v4 proxy, which makes it easy to route
-your mail through an encrypted tunnel using "ssh -N -D" or via the Tor
+your mail through an encrypted tunnel created by "ssh -N -D" or via the Tor
 anonymising network.

 For example, this will run an E-MailRelay proxy on port 587 that routes via a
@ -346,4 +346,4 @@ local Tor server on port 9050 to the mail server at smtp.example.com:


 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/whatisit.svg
+++ b/doc/whatisit.svg
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
--- a/doc/windows.html
+++ b/doc/windows.html
@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "%-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
  <title>E-MailRelay Windows</title>
@ -12,12 +12,12 @@
   <h2><a class="a-header" name="SH_1_1">Setup program</a></h2> <!-- index:2:SH:1:1:Setup program -->
    <p>
     Installing E-MailRelay on Windows should be straightforward if you have the
-     setup program <em class="quote">emailrelay-setup.exe</em> and its associated <em class="quote">payload</em> files.
+     setup program <em>emailrelay-setup.exe</em> and its associated <em>payload</em> files.
    </p>

    <p>
-     Run <em class="quote">emailrelay-setup.exe</em> as an administrator if you are going to be installing
-     into protected directories like <em class="quote">Program Files</em>.
+     Run <em>emailrelay-setup.exe</em> as an administrator if you are going to be installing
+     into protected directories like <em>Program Files</em>.
    </p>

    <p>
@ -28,19 +28,19 @@
    <p>
     If anything goes wrong with the installation process then you can still just
     run the main E-MailRelay executable straight out of the distribution zip file.
-     Follow the <em class="quote">Manual installation</em> section below for more help.
+     Follow the <em>Manual installation</em> section below for more help.
    </p>
   <h2><a class="a-header" name="SH_1_2">Running the program</a></h2> <!-- index:2:SH:1:2:Running the program -->
    <p>
     After a successful installation you should see E-MailRelay listed in the Windows
-     Start Menu. This will run the <em class="quote">emailrelay-start.bat</em> batch file to start
+     Start Menu. This will run the <em>emailrelay-start.bat</em> batch file to start
     the E-MailRelay server, and you should then see an icon appear in the Windows
     system tray.
    </p>
   <h2><a class="a-header" name="SH_1_3">Configuration</a></h2> <!-- index:2:SH:1:3:Configuration -->
    <p>
-     E-MailRelay is configured though command-line options like <em class="quote">--verbose</em> or
-     <em class="quote">--spool-dir=c:/temp</em> in the <em class="quote">emailrelay-startup.bat</em> batch file.
+     E-MailRelay is configured though command-line options like <em>--verbose</em> or
+     <em>--spool-dir=c:/temp</em> in the <em>emailrelay-startup.bat</em> batch file.
    </p>

    <p>
@ -48,14 +48,22 @@
     some Windows-specific variations:
    </p>
    <ul>
-     <li>The <em class="quote">--syslog</em> option refers to the Windows Event Viewer's Application log.</li>
-     <li>The <em class="quote">--no-daemon</em> option is used to disable the icon in the system tray.</li>
-     <li>The <em class="quote">--hidden</em> option with <em class="quote">--no-daemon</em> hides all windows and suppresses message boxes.</li>
+     <li>The <em>--syslog</em> option refers to the Windows Event Viewer's Application log.</li>
+     <li>The <em>--no-daemon</em> option is used for a normal window rather than an icon in the system tray.</li>
+     <li>The <em>--minimise</em> option, used with <em>--no-daemon</em>, makes the window start minimised.</li>
+     <li>The <em>--hidden</em> option with <em>--no-daemon</em> hides all windows and suppresses message boxes.</li>
    </ul>

    <p>
-     Account information can be configured by editing the E-MailRelay <em class="quote">secrets</em> file.
-     Look for the <em class="quote">--client-auth</em> or <em class="quote">--server-auth</em> options in the startup batch
+     The Windows-only <em>--show</em> option can be used as a more flexible alternative
+     to <em>--no-daemon</em> and <em>--hidden</em> using <em>--show=popup</em> and <em>--show=hidden</em>
+     respectively, or <em>--show=window</em> for a minimisable window, <em>--show=tray</em>
+     for the default system-tray icon or <em>--show=window,tray</em> for both.
+    </p>
+
+    <p>
+     Account information can be configured by editing the E-MailRelay <em>secrets</em> file.
+     Look for the <em>--client-auth</em> or <em>--server-auth</em> options in the startup batch
     file to find out where this is.
    </p>
   <h2><a class="a-header" name="SH_1_4">Manual installation</a></h2> <!-- index:2:SH:1:4:Manual installation -->
@ -64,29 +72,29 @@
     setup program, goes something like this:
    </p>
    <ul>
-     <li>Create a new program directory <em class="quote">c:\Program Files\E-MailRelay</em></li>
-     <li>Copy the packaged files into <em class="quote">c:\Program Files\E-MailRelay</em></li>
-     <li>Create a new spool directory <em class="quote">c:\ProgramData\E-MailRelay\spool</em></li>
-     <li>Create a new text file, eg. <em class="quote">c:\ProgramData\E-MailRelay\emailrelay-auth.txt</em>, to contain account details</li>
-     <li>Add your account details to <em class="quote">emailrelay-auth.txt</em> with a line like <em class="quote">client plain myaccount mypassword</em></li>
-     <li>Right-drag <em class="quote">emailrelay.exe</em> onto the desktop to create a shortcut for the server.</li>
-     <li>Add <em class="quote">--as-server --verbose</em> to the server shortcut properties in the <em class="quote">target</em> box.</li>
+     <li>Create a new program directory <em>c:\Program Files\E-MailRelay</em></li>
+     <li>Copy the packaged files into <em>c:\Program Files\E-MailRelay</em></li>
+     <li>Create a new spool directory <em>c:\ProgramData\E-MailRelay\spool</em></li>
+     <li>Create a new text file, eg. <em>c:\ProgramData\E-MailRelay\emailrelay-auth.txt</em>, to contain account details</li>
+     <li>Add your account details to <em>emailrelay-auth.txt</em> with a line like <em>client plain myaccount mypassword</em></li>
+     <li>Right-drag <em>emailrelay.exe</em> onto the desktop to create a shortcut for the server.</li>
+     <li>Add <em>--as-server --verbose</em> to the server shortcut properties in the <em>target</em> box.</li>
     <li>Right-drag again to create a shortcut to do the forwarding.</li>
-     <li>Add <em class="quote">--as-client example.com:smtp --client-auth c:\ProgramData\E-MailRelay\emailrelay-auth.txt</em> to the client shortcut.</li>
+     <li>Add <em>--as-client example.com:smtp --client-auth c:\ProgramData\E-MailRelay\emailrelay-auth.txt</em> to the client shortcut.</li>
    </ul>

    <p>
-     Copy the shortcuts to <em class="quote">Start Menu</em> and <em class="quote">Startup</em> folders as necessary.
+     Copy the shortcuts to <em>Start Menu</em> and <em>Startup</em> folders as necessary.
    </p>
   <h2><a class="a-header" name="SH_1_5">Running as a service</a></h2> <!-- index:2:SH:1:5:Running as a service -->
    <p>
     E-MailRelay can be set up as a service so that it starts up automatically at
     boot-time. If you are setting this up manually you must first have a one-line
-     batch file called <em class="quote">emailrelay-start.bat</em> that contains all the command-line
+     batch file called <em>emailrelay-start.bat</em> that contains all the command-line
     options for running the E-MailRelay server, and you must have a simple
-     configuration file called <em class="quote">emailrelay-service.cfg</em> that points to it. The
+     configuration file called <em>emailrelay-service.cfg</em> that points to it. The
     configuration file must be in the same directory as the
-     <em class="quote">emailrelay-service.exe</em> executable.
+     <em>emailrelay-service.exe</em> executable.
    </p>

    <p>
@ -98,7 +106,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     There is no need to use <em class="quote">--no-daemon</em> and <em class="quote">--hidden</em>; these are added
+     There is no need to use <em>--no-daemon</em> and <em>--hidden</em>; these are added
     automatically.
    </p>

@ -111,7 +119,7 @@
 </pre>
      </div><!-- div-pre -->
    <p>
-     Then just run <em class="quote">emailrelay-service --install</em> from an Administrator command
+     Then just run <em>emailrelay-service --install</em> from an Administrator command
     prompt to install the service.
    </p>

@ -122,9 +130,9 @@

    <p>
     If you need to run multiple E-MailRelay services then put a unique service
-     name and display name on the <em class="quote">emailrelay-service --install &lt;name&gt; &lt;display-name&gt;</em>
+     name and display name on the <em>emailrelay-service --install <name> <display-name></em>
     command-line. The service name you give is used to derive the name of the
-     <em class="quote">&lt;name&gt;-start.bat</em> batch file that contains the E-MailRelay server's
+     <em><name>-start.bat</em> batch file that contains the E-MailRelay server's
     command-line options, so you will need to create that first.
    </p>
   <h2><a class="a-header" name="SH_1_6">Uninstall</a></h2> <!-- index:2:SH:1:6:Uninstall -->
@ -132,43 +140,42 @@
     To uninstall:
    </p>
    <ul>
-     <li>Stop the program and/or the service (<em class="quote">ControlPanel</em>-&gt;<em class="quote">SystemAndSecurity</em>-&gt;<em class="quote">AdministrativeTools</em>-&gt;<em class="quote">Services</em>).</li>
-     <li>Uninstall the service, if installed (<em class="quote">emailrelay-service --remove</em>).</li>
-     <li>Delete the files from the E-MailRelay <em class="quote">program files</em> folder (eg. <em class="quote">C:\Program Files\E-MailRelay</em>).</li>
-     <li>Delete the files from the E-MailRelay <em class="quote">program data</em> folder (eg. <em class="quote">C:\ProgramData\E-MailRelay</em>).</li>
-     <li>Delete any desktop shortcuts (eg. <em class="quote">%USERPROFILE%\Desktop\E-MailRelay.lnk</em>).</li>
-     <li>Delete any start menu shortcuts (eg. <em class="quote">%APPDATA%\Microsoft\Windows\Start Menu\Programs\E-MailRelay.lnk</em>).</li>
-     <li>Delete any auto-start shortcuts (eg. <em class="quote">%APPDATA%\Microsoft\Windows\Start Menu\Programs\Startup\E-MailRelay.lnk</em>).</li>
-     <li>Clean up the registry under <em class="quote">HKLM\System\CurrentControlSet\Services\EventLog\Application\emailrelay</em>.</li>
+     <li>Stop the program and/or the service (<em>ControlPanel</em>-><em>SystemAndSecurity</em>-><em>AdministrativeTools</em>-><em>Services</em>).</li>
+     <li>Uninstall the service, if installed (<em>emailrelay-service --remove</em>).</li>
+     <li>Delete the files from the E-MailRelay <em>program files</em> folder (eg. <em>C:\Program Files\E-MailRelay</em>).</li>
+     <li>Delete the files from the E-MailRelay <em>program data</em> folder (eg. <em>C:\ProgramData\E-MailRelay</em>).</li>
+     <li>Delete any desktop shortcuts (eg. <em>%USERPROFILE%\Desktop\E-MailRelay.lnk</em>).</li>
+     <li>Delete any start menu shortcuts (eg. <em>%APPDATA%\Microsoft\Windows\Start Menu\Programs\E-MailRelay.lnk</em>).</li>
+     <li>Delete any auto-start shortcuts (eg. <em>%APPDATA%\Microsoft\Windows\Start Menu\Programs\Startup\E-MailRelay.lnk</em>).</li>
+     <li>Clean up the registry under <em>HKLM\System\CurrentControlSet\Services\EventLog\Application\emailrelay</em>.</li>
    </ul>
   <h2><a class="a-header" name="SH_1_7">Diagnostics</a></h2> <!-- index:2:SH:1:7:Diagnostics -->
    <p>
-     E-MailRelay normally writes errors and warnings into the Windows Event Log,
-     which you can view by running <em class="quote">eventvwr.exe</em> or going to
-     <em class="quote">ControlPanel</em>-&gt;<em class="quote">SystemAndSecurity</em>-&gt;<em class="quote">AdministrativeTools</em>-&gt;<em class="quote">EventViewer</em>; from
-     there look under <em class="quote">Windows Logs</em> and <em class="quote">Application</em>.
+     E-MailRelay logging is sent to the Windows Event Log and/or written to a log
+     file, and individual failed mail messages will have the failure reason recorded
+     inside the <em>.bad</em> envelope file.
    </p>

    <p>
-     You can increase the verbosity of the logging by adding the <em class="quote">--verbose</em> option
-     to the E-MailRelay command-line, typically by editing the <em class="quote">emailrelay-start.bat</em>
+     The Windows Event Log can be accessed by running <em>eventvwr.exe</em> or going to
+     <em>ControlPanel</em>-><em>SystemAndSecurity</em>-><em>AdministrativeTools</em>-><em>EventViewer</em>; from
+     there look under <em>Windows Logs</em> and <em>Application</em>.
+    </p>
+
+    <p>
+     You can increase the verbosity of the logging by adding the <em>--verbose</em> option
+     to the E-MailRelay command-line, typically by editing the <em>emailrelay-start.bat</em>
     batch script.
    </p>
-
-    <p>
-     The Windows Event Log is a bit clunky, so consider using daily log files by
-     using the E-MailRelay <em class="quote">--log-file</em> option with the special <em class="quote">%d</em> date
-     placeholder. Then turn off the event-log logging with <em class="quote">--no-syslog</em>.
-    </p>
   <h2><a class="a-header" name="SH_1_8">Testing with telnet</a></h2> <!-- index:2:SH:1:8:Testing with telnet -->
    <p>
-     The <em class="quote">telnet</em> program can be used for testing an E-MailRelay server. You should
+     The <em>telnet</em> program can be used for testing an E-MailRelay server. You should
     start by enabling the Windows telnet client using
-     <em class="quote">ControlPanel</em>-&gt;<em class="quote">Programs</em>-&gt;<em class="quote">TurnWindowsFeaturesOnAndOff</em>.
+     <em>ControlPanel</em>-><em>Programs</em>-><em>TurnWindowsFeaturesOnAndOff</em>.
    </p>

    <p>
-     Then run telnet from a command prompt, using <em class="quote">localhost</em> and the E-MailRelay
+     Then run telnet from a command prompt, using <em>localhost</em> and the E-MailRelay
     port number as command-line parameters:
    </p>

@ -178,17 +185,17 @@
      </div><!-- div-pre -->
    <p>
     This should show a greeting from the E-MailRelay server and then you can
-     start typing SMTP commands like <em class="quote">EHLO</em>, <em class="quote">MAIL FROM:&lt;..&gt;</em>, <em class="quote">RCPT TO:&lt;...&gt;</em>
-     and <em class="quote">DATA</em>.
+     start typing SMTP commands like <em>EHLO</em>, <em>MAIL FROM:<..></em>, <em>RCPT TO:<...></em>
+     and <em>DATA</em>.
    </p>
   <h2><a class="a-header" name="SH_1_9">Building from source</a></h2> <!-- index:2:SH:1:9:Building from source -->
    <p>
     E-MailRelay can be compiled on Windows using Microsoft Visual Studio C++ (MSVC)
-     or mingw-w64. For MSVC builds there is a perl script (<em class="quote">winbuild</em>) that creates
-     <em class="quote">cmake</em> files from the autotools makefiles, runs <em class="quote">cmake</em> to create the MSVC
-     project files and then runs <em class="quote">msbuild</em> to compile E-MailRelay. If perl, cmake,
+     or mingw-w64. For MSVC builds there is a perl script (<em>winbuild</em>) that creates
+     <em>cmake</em> files from the autotools makefiles, runs <em>cmake</em> to create the MSVC
+     project files and then runs <em>msbuild</em> to compile E-MailRelay. If perl, cmake,
     MSVC, Qt and mbedTLS source are installed in the right way then the
-     <em class="quote">winbuild.bat</em> batch file should be able to do a complete MSVC release build
+     <em>winbuild.bat</em> batch file should be able to do a complete MSVC release build
     in one go.
    </p>

@ -196,10 +203,10 @@

    <div class="div-footer">
     <p>
-      Copyright (C) 2001-2018 Graeme Walker
+      Copyright (C) 2001-2019 Graeme Walker
     </p>
    </div><!-- div-footer -->
 </div> <!-- div-main -->
 </body>
 </html>
-<!-- Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
+<!-- Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->
--- a/doc/windows.md
+++ b/doc/windows.md
@ -32,9 +32,15 @@ These options are all documented in the reference document, although there are
 some Windows-specific variations:

 * The `--syslog` option refers to the Windows Event Viewer's Application log.
-* The `--no-daemon` option is used to disable the icon in the system tray.
+* The `--no-daemon` option is used for a normal window rather than an icon in the system tray.
+* The `--minimise` option, used with `--no-daemon`, makes the window start minimised.
 * The `--hidden` option with `--no-daemon` hides all windows and suppresses message boxes.

+The Windows-only `--show` option can be used as a more flexible alternative
+to `--no-daemon` and `--hidden` using `--show=popup` and `--show=hidden`
+respectively, or `--show=window` for a minimisable window, `--show=tray`
+for the default system-tray icon or `--show=window,tray` for both.
+
 Account information can be configured by editing the E-MailRelay `secrets` file.
 Look for the `--client-auth` or `--server-auth` options in the startup batch
 file to find out where this is.
@ -104,8 +110,11 @@ To uninstall:

 Diagnostics
 -----------
-E-MailRelay normally writes errors and warnings into the Windows Event Log,
-which you can view by running `eventvwr.exe` or going to
+E-MailRelay logging is sent to the Windows Event Log and/or written to a log
+file, and individual failed mail messages will have the failure reason recorded
+inside the `.bad` envelope file.
+
+The Windows Event Log can be accessed by running `eventvwr.exe` or going to
 `ControlPanel`->`SystemAndSecurity`->`AdministrativeTools`->`EventViewer`; from
 there look under `Windows Logs` and `Application`.

@ -113,10 +122,6 @@ You can increase the verbosity of the logging by adding the `--verbose` option
 to the E-MailRelay command-line, typically by editing the `emailrelay-start.bat`
 batch script.

-The Windows Event Log is a bit clunky, so consider using daily log files by
-using the E-MailRelay `--log-file` option with the special `%d` date
-placeholder. Then turn off the event-log logging with `--no-syslog`.
-
 Testing with telnet
 -------------------
 The `telnet` program can be used for testing an E-MailRelay server. You should
@ -148,4 +153,4 @@ in one go.
 [SMTP]: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol

 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/doc/windows.rst
+++ b/doc/windows.rst
@ -33,9 +33,15 @@ These options are all documented in the reference document, although there are
 some Windows-specific variations:

 * The *--syslog* option refers to the Windows Event Viewer's Application log.
-* The *--no-daemon* option is used to disable the icon in the system tray.
+* The *--no-daemon* option is used for a normal window rather than an icon in the system tray.
+* The *--minimise* option, used with *--no-daemon*, makes the window start minimised.
 * The *--hidden* option with *--no-daemon* hides all windows and suppresses message boxes.

+The Windows-only *--show* option can be used as a more flexible alternative
+to *--no-daemon* and *--hidden* using *--show=popup* and *--show=hidden*
+respectively, or *--show=window* for a minimisable window, *--show=tray*
+for the default system-tray icon or *--show=window,tray* for both.
+
 Account information can be configured by editing the E-MailRelay *secrets* file.
 Look for the *--client-auth* or *--server-auth* options in the startup batch
 file to find out where this is.
@ -109,8 +115,11 @@ To uninstall:

 Diagnostics
 ===========
-E-MailRelay normally writes errors and warnings into the Windows Event Log,
-which you can view by running *eventvwr.exe* or going to
+E-MailRelay logging is sent to the Windows Event Log and/or written to a log
+file, and individual failed mail messages will have the failure reason recorded
+inside the *.bad* envelope file.
+
+The Windows Event Log can be accessed by running *eventvwr.exe* or going to
 \ *ControlPanel*\ ->\ *SystemAndSecurity*\ ->\ *AdministrativeTools*\ ->\ *EventViewer*\ ; from
 there look under *Windows Logs* and *Application*.

@ -118,10 +127,6 @@ You can increase the verbosity of the logging by adding the *--verbose* option
 to the E-MailRelay command-line, typically by editing the *emailrelay-start.bat*
 batch script.

-The Windows Event Log is a bit clunky, so consider using daily log files by
-using the E-MailRelay *--log-file* option with the special *%d* date
-placeholder. Then turn off the event-log logging with *--no-syslog*.
-
 Testing with telnet
 ===================
 The *telnet* program can be used for testing an E-MailRelay server. You should
@ -155,4 +160,4 @@ in one go.

 .. _SMTP: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol

-.. footer:: Copyright (C) 2001-2018 Graeme Walker
+.. footer:: Copyright (C) 2001-2019 Graeme Walker
--- a/doc/windows.txt
+++ b/doc/windows.txt
@ -31,9 +31,15 @@ E-MailRelay is configured though command-line options like "--verbose" or
 These options are all documented in the reference document, although there are
 some Windows-specific variations:
 * The "--syslog" option refers to the Windows Event Viewer's Application log.
-* The "--no-daemon" option is used to disable the icon in the system tray.
+* The "--no-daemon" option is used for a normal window rather than an icon in the system tray.
+* The "--minimise" option, used with "--no-daemon", makes the window start minimised.
 * The "--hidden" option with "--no-daemon" hides all windows and suppresses message boxes.

+The Windows-only "--show" option can be used as a more flexible alternative
+to "--no-daemon" and "--hidden" using "--show=popup" and "--show=hidden"
+respectively, or "--show=window" for a minimisable window, "--show=tray"
+for the default system-tray icon or "--show=window,tray" for both.
+
 Account information can be configured by editing the E-MailRelay "secrets" file.
 Look for the "--client-auth" or "--server-auth" options in the startup batch
 file to find out where this is.
@ -101,8 +107,11 @@ To uninstall:

 Diagnostics
 -----------
-E-MailRelay normally writes errors and warnings into the Windows Event Log,
-which you can view by running "eventvwr.exe" or going to
+E-MailRelay logging is sent to the Windows Event Log and/or written to a log
+file, and individual failed mail messages will have the failure reason recorded
+inside the ".bad" envelope file.
+
+The Windows Event Log can be accessed by running "eventvwr.exe" or going to
 "ControlPanel"->"SystemAndSecurity"->"AdministrativeTools"->"EventViewer"; from
 there look under "Windows Logs" and "Application".

@ -110,10 +119,6 @@ You can increase the verbosity of the logging by adding the "--verbose" option
 to the E-MailRelay command-line, typically by editing the "emailrelay-start.bat"
 batch script.

-The Windows Event Log is a bit clunky, so consider using daily log files by
-using the E-MailRelay "--log-file" option with the special "%d" date
-placeholder. Then turn off the event-log logging with "--no-syslog".
-
 Testing with telnet
 -------------------
 The "telnet" program can be used for testing an E-MailRelay server. You should
@ -142,4 +147,4 @@ in one go.


 _____________________________________
-Copyright (C) 2001-2018 Graeme Walker
+Copyright (C) 2001-2019 Graeme Walker
--- a/emailrelay.spec
+++ b/emailrelay.spec
@ -1,11 +1,11 @@
 Summary: Simple e-mail message transfer agent and proxy using SMTP
 Name: emailrelay
-Version: 2.0.1
+Version: 2.1
 Release: 1
 License: GPL3
 Group: System Environment/Daemons
-URL: http://emailrelay.sourceforge.net/
-Source: http://sourceforge.net/projects/emailrelay/files/emailrelay/2.0.1/emailrelay-2.0.1-src.tar.gz
+URL: http://emailrelay.sourceforge.net
+Source: http://sourceforge.net/projects/emailrelay/files/emailrelay/2.1/emailrelay-2.1-src.tar.gz
 BuildRoot: /tmp/emailrelay-install

 %description
@ -29,22 +29,24 @@ excellent scalability and resource usage.
 C++ source code is available and distribution is permitted under the GNU
 General Public License V3.

+%global debug_package %{nil}
 %prep
 %setup

 %build
-./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d --disable-gui --without-man2html --without-doxygen --with-openssl --without-mbedtls --with-pam --disable-install-hook
+./configure --prefix=/usr --localstatedir=/var --libexecdir=/usr/lib --sysconfdir=/etc e_initdir=/etc/init.d --without-doxygen --without-man2html --with-openssl --without-mbedtls --with-pam --disable-gui --disable-install-hook --disable-testing
 make

 %install
 make install-strip destdir=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT
-
-%post
-test -f /usr/lib/lsb/install_initd && cd $RPM_BUILD_ROOT/etc/init.d && /usr/lib/lsb/install_initd emailrelay || true
 test -f $RPM_BUILD_ROOT/etc/emailrelay.conf || cp $RPM_BUILD_ROOT/etc/emailrelay.conf.template $RPM_BUILD_ROOT/etc/emailrelay.conf || true

+%post
+test -x /etc/init.d/emailrelay && /etc/init.d/emailrelay setup || true
+test -x /sbin/chkconfig && cd /etc/init.d && /sbin/chkconfig --add emailrelay || true
+
 %preun
-test $1 -eq 0 && test -f /usr/lib/lsb/remove_initd && cd /etc/init.d && /usr/lib/lsb/remove_initd emailrelay || true
+test -x /sbin/chkconfig && /sbin/chkconfig --del emailrelay || true

 %clean
 test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT"
@ -56,19 +58,25 @@ test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT"
 /etc/emailrelay.conf.template
 /etc/init.d/emailrelay
 %config /etc/pam.d/emailrelay
-/usr/lib/emailrelay/emailrelay-filter-copy
+%dir /usr/lib/emailrelay
+%attr(2755, root, daemon) /usr/lib/emailrelay/emailrelay-filter-copy
+%dir /usr/lib/emailrelay/examples
 /usr/lib/emailrelay/examples/emailrelay
 /usr/lib/emailrelay/examples/emailrelay-bcc-check.pl
 /usr/lib/emailrelay/examples/emailrelay-deliver.sh
 /usr/lib/emailrelay/examples/emailrelay-multicast.sh
 /usr/lib/emailrelay/examples/emailrelay-notify.sh
-/usr/lib/emailrelay/examples/emailrelay-process.sh
 /usr/lib/emailrelay/examples/emailrelay-resubmit.sh
+/usr/lib/emailrelay/examples/emailrelay-rot13.pl
 /usr/lib/emailrelay/examples/emailrelay-sendmail.pl
+/usr/lib/emailrelay/examples/emailrelay-set-from.js
+/usr/lib/emailrelay/examples/emailrelay-set-from.pl
 /usr/lib/emailrelay/examples/emailrelay-submit.sh
 /usr/sbin/emailrelay
 /usr/sbin/emailrelay-passwd
-/usr/sbin/emailrelay-submit
+%attr(2755, root, daemon) /usr/sbin/emailrelay-submit
+%docdir /usr/share/doc/emailrelay
+%dir /usr/share/doc/emailrelay
 %doc /usr/share/doc/emailrelay/AUTHORS
 %doc /usr/share/doc/emailrelay/COPYING
 %doc /usr/share/doc/emailrelay/ChangeLog
@ -80,7 +88,7 @@ test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT"
 %doc /usr/share/doc/emailrelay/changelog.md
 %doc /usr/share/doc/emailrelay/changelog.rst
 %doc /usr/share/doc/emailrelay/changelog.txt
-%doc /usr/share/doc/emailrelay/conf.py
+%doc /usr/share/doc/emailrelay/conf.py.sphinx
 %doc /usr/share/doc/emailrelay/developer.html
 %doc /usr/share/doc/emailrelay/developer.md
 %doc /usr/share/doc/emailrelay/developer.rst
@ -113,11 +121,13 @@ test "$RPM_BUILD_ROOT" = "/" || rm -rf "$RPM_BUILD_ROOT"
 %doc /usr/share/doc/emailrelay/windows.md
 %doc /usr/share/doc/emailrelay/windows.rst
 %doc /usr/share/doc/emailrelay/windows.txt
+%dir /usr/share/emailrelay
 /usr/share/emailrelay/emailrelay-icon.png
 /usr/share/man/man1/emailrelay-filter-copy.1.gz
 /usr/share/man/man1/emailrelay-passwd.1.gz
 /usr/share/man/man1/emailrelay-submit.1.gz
 /usr/share/man/man1/emailrelay.1.gz
+%dir %attr(2775, root, daemon) /var/spool/emailrelay

 %changelog

--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
@ -38,8 +38,9 @@ clean-local:

 if GCONFIG_INSTALL_HOOK

-# create the .conf file from .conf.template with directory edits - dont
-# use this when running configure for building a .deb or .rpm package
+# create the .conf file from .conf.template with directory edits - disable
+# this when running configure for a .deb or .rpm package by using
+# 'configure --disable-install-hook'
 install-data-hook:
 	if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cat "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" | sed "s:^#spool-dir .*:spool-dir $(e_spooldir):g" | sed 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' | sed "s:/etc:$(e_sysconfdir):g" | sed "s:/usr/local/bin:$(e_libexecdir):g" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi
 	cp "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall"
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@ -91,10 +91,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = etc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -166,6 +166,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -174,15 +175,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -248,6 +247,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
@ -527,8 +527,9 @@ emailrelay: emailrelay.pam
 clean-local:
 	-rm -f emailrelay 2>/dev/null

-# create the .conf file from .conf.template with directory edits - dont
-# use this when running configure for building a .deb or .rpm package
+# create the .conf file from .conf.template with directory edits - disable
+# this when running configure for a .deb or .rpm package by using
+# 'configure --disable-install-hook'
@GCONFIG_INSTALL_HOOK_TRUE@install-data-hook:
@GCONFIG_INSTALL_HOOK_TRUE@	if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else cat "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" | sed "s:^#spool-dir .*:spool-dir $(e_spooldir):g" | sed 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' | sed "s:/etc:$(e_sysconfdir):g" | sed "s:/usr/local/bin:$(e_libexecdir):g" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi
@GCONFIG_INSTALL_HOOK_TRUE@	cp "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall"
--- a/etc/emailrelay.auth.template
+++ b/etc/emailrelay.auth.template
@ -32,9 +32,6 @@
 # other authentication mechanisms. Hashed passwords should be generated
 # by running the "emailrelay-passwd" program.
 #
-# For backwards compatibility the first two fields can be reversed and the
-# hashed passwords can be in an older dotted-decimal format.
-#
 # Any unusual characters (including space, "=" and "+") in the "name" and
 # "password" fields should encoded using the RFC-1891 "xtext" encoding scheme
 # so that they are representing as hexadecimal ascii as "+XX".
--- a/etc/emailrelay.conf.template
+++ b/etc/emailrelay.conf.template
@ -87,14 +87,24 @@
 #
 #client-auth /etc/emailrelay.auth

+# Name: client-auth-config
+# Format: client-auth-config <config>
+# Description: Configures the SMTP client authentication module using a
+# semicolon-separated list of configuration items. Each item is a
+# single-character key, followed by a colon and then a comma-separated	list.
+# A 'm' character introduces an ordered list of authentication	mechanisms,
+# and an 'x' is used for blocklisted mechanisms.
+#
+#client-auth-config m:cram-sha1,cram-md5
+
 # Name: client-filter
 # Format: client-filter <program>
 # Description: Runs the specified external filter program whenever a mail
 # message is forwarded. The filter is passed the name of the message file in
 # the spool directory so that it can edit it as required. A network filter
-# can be specified as "net:<transport-address>" and prefixes of "spam:" and
-# "exit:" are also allowed. The "--filter" option is normally more useful
-# than "--client-filter".
+# can be specified as "net:<transport-address>" and prefixes of "spam:",
+# "spam-edit:" and "exit:" are also allowed. The "--filter" option is
+# normally more useful than "--client-filter".
 #
 #client-filter /usr/local/sbin/emailrelay-client-filter

@ -187,11 +197,20 @@
 #
 #debug

+# Name: dnsbl
+# Format: dnsbl <config>
+# Description: Specifies a list of DNSBL servers that are used to reject SMTP
+#  connections from blocked addresses. The configuration string is made up of
+# comma-separated fields: the DNS server's transport address, a timeout in
+# milliseconds, a rejection threshold, and then the list of DNSBL servers.
+#
+#dnsbl 1.1.1.1:53,1000,1,spam.dnsbl.example.com,block.dnsbl.example.com
+
 # Name: domain
 # Format: domain <fqdn>
 # Description: Specifies the network name that is used in SMTP EHLO commands,
 # "Received" lines, and for generating authentication challenges. The default
-# network name it derived from a DNS lookup of the local hostname.
+# is derived from a DNS lookup of the local hostname.
 #
 #domain smtp.example.com

@ -210,8 +229,10 @@
 # spool directory so that it can edit it as required. The mail message is
 # rejected if the filter program terminates with an exit code between 1 and
 # 99. Use "net:<transport-address>" to communicate with a filter daemon over
-# the network, or "spam:<transport-address>" to talk to a spamassassin spamd
-# daemon, or "exit:<number>" to emulate a filter program that just exits.
+# the network, or "spam:<transport-address>" for a spamassassin spamd daemon
+# to accept or reject mail messages, or  "spam-edit:<transport-address>" to
+# have spamassassin edit the message  content without rejecting it, or
+# "exit:<number>" to emulate a filter  program that just exits.
 #
 #filter /usr/local/sbin/emailrelay-filter

@ -250,11 +271,18 @@
 #
 #hidden

+# Name: idle-timeout
+# Format: idle-timeout <time>
+# Description: Specifies a timeout (in seconds) for receiving network traffic
+# from	remote SMTP and POP clients. The default is 1800 seconds.
+#
+#idle-timeout 2
+
 # Name: immediate
 # Format: immediate
-# Description: Causes mail messages to be forwarded as soon as they are
-# submitted, even before they are accepted. This can be used to do proxying
-# without store-and-forward, but in practice clients tend to to time out
+# Description: Causes mail messages to be forwarded as they are received,
+# even before  they have been accepted. This can be used to do proxying
+# without  store-and-forward, but in practice clients tend to to time out
 # while waiting for their mail message to be accepted.
 #
 #immediate
@ -270,7 +298,7 @@
 # comma-separated list. Use a prefix of "smtp=", "pop=" or "admin=" on
 # addresses that should apply only to those types of listening port.
 #
-#interface 192.168.0.1,127.0.0.1,::1
+#interface 192.168.0.1,127.0.0.1,pop=::1,smtp=::

 # Name: log
 # Format: log
@ -326,7 +354,7 @@
 # when the program starts up, typically after it has become a backgroud
 # daemon.
 #
-#pid-file /var/run/emailrelay/emailrelay.pid
+#pid-file /run/emailrelay/emailrelay.pid

 # Name: poll
 # Format: poll <period>
@ -338,7 +366,7 @@
 # Name: pop
 # Format: pop
 # Description: Enables the POP server listening, by default on port 110,
-# providing access to spooled mail messages. Negotiated TLS using the POP3
+# providing access to spooled mail messages. Negotiated TLS using the POP
 # "STLS" command will be enabled if the "--server-tls" option is also given.
 #
 #pop
@ -358,10 +386,11 @@
 # Description: Modifies the spool directory used by the POP server to be a
 # sub-directory with the same name as the POP authentication user-id. This
 # allows multiple POP clients to read the spooled messages without
-# interfering with each other. Content files can stay in the main spool
-# directory with the envelope files copied into user-specific
-# sub-directories. The "emailrelay-filter-copy" program is a convenient way
-# of doing this when run via "--filter".
+# interfering with each other, particularly when also  using
+# "--pop-no-delete". Content files can stay in the main spool  directory with
+# only the envelope files copied into user-specific  sub-directories. The
+# "emailrelay-filter-copy" program is a  convenient way of doing this when
+# run via "--filter".
 #
 #pop-by-name

@ -423,6 +452,16 @@
 #
 #server-auth /etc/private/emailrelay.auth

+# Name: server-auth-config
+# Format: server-auth-config <config>
+# Description: Configures the SMTP server authentication module using a
+# semicolon-separated list of configuration items. Each item is a
+# single-character key, followed by a colon and then a comma-separated	list.
+# A 'm' character introduces a preferred sub-set of the built-in
+# authentication mechanisms, and an 'x' is used for blocklisted  mechanisms.
+#
+#server-auth-config m:cram-sha256,cram-sha1
+
 # Name: server-tls
 # Format: server-tls
 # Description: Enables TLS for incoming SMTP and POP connections. SMTP
@ -494,7 +533,8 @@
 # Format: user <username>
 # Description: When started as root the program switches to an non-privileged
 # effective user-id when idle. This option can be used to define which
-# user-id is used. Ignored on Windows.
+# user-id is used. Specify "root" to disable all user-id switching. Ignored
+# on Windows.
 #
 #user nobody

--- a/gconfig_defs.h.in
+++ b/gconfig_defs.h.in
@ -6,18 +6,36 @@
 /* Define true to use std::thread */
 #undef GCONFIG_ENABLE_STD_THREAD

+/* Define true if arpa/inet.h is available */
+#undef GCONFIG_HAVE_ARPA_INET_H
+
 /* Define true if compiler has std::align() */
 #undef GCONFIG_HAVE_CXX_ALIGNMENT

 /* Define true if compiler supports c++ constexpr */
 #undef GCONFIG_HAVE_CXX_CONSTEXPR

+/* Define true if compiler supports c++ =default */
+#undef GCONFIG_HAVE_CXX_DEFAULTED
+
+/* Define true if compiler supports c++ =delete */
+#undef GCONFIG_HAVE_CXX_DELETED
+
 /* Define true if compiler has std::vector::emplace_back() */
 #undef GCONFIG_HAVE_CXX_EMPLACE

+/* Define true if compiler supports c++ class enums */
+#undef GCONFIG_HAVE_CXX_ENUM_CLASS
+
 /* Define true if compiler supports c++ final keyword */
 #undef GCONFIG_HAVE_CXX_FINAL

+/* Define true if compiler supports c++ initializer_list */
+#undef GCONFIG_HAVE_CXX_INITIALIZER_LIST
+
+/* Define true if compiler has std::move() */
+#undef GCONFIG_HAVE_CXX_MOVE
+
 /* Define true if compiler supports c++ noexcept */
 #undef GCONFIG_HAVE_CXX_NOEXCEPT

@ -39,9 +57,15 @@
 /* Define true if compiler has <type_traits> make_unsigned */
 #undef GCONFIG_HAVE_CXX_TYPE_TRAITS_MAKE_UNSIGNED

+/* Define true if errno.h is available */
+#undef GCONFIG_HAVE_ERRNO_H
+
 /* Define true if errno_t type definition in error.h */
 #undef GCONFIG_HAVE_ERRNO_T

+/* Define true if _fsopen() is available */
+#undef GCONFIG_HAVE_FSOPEN
+
 /* Define true if getenv_s in stdlib.h */
 #undef GCONFIG_HAVE_GETENV_S

@ -51,6 +75,9 @@
 /* Define true if getpwnam_r in pwd.h */
 #undef GCONFIG_HAVE_GETPWNAM_R

+/* Define true if gid_t is a type */
+#undef GCONFIG_HAVE_GID_T
+
 /* Define true if gmtime_r in time.h */
 #undef GCONFIG_HAVE_GMTIME_R

@ -66,6 +93,18 @@
 /* Define true if inet_pton() is available */
 #undef GCONFIG_HAVE_INET_PTON

+/* Define true if compiler has int16_t in stdint.h */
+#undef GCONFIG_HAVE_INT16
+
+/* Define true if compiler has int32_t in stdint.h */
+#undef GCONFIG_HAVE_INT32
+
+/* Define true if compiler has int64_t in stdint.h */
+#undef GCONFIG_HAVE_INT64
+
+/* Define true if inttypes.h is available */
+#undef GCONFIG_HAVE_INTTYPES_H
+
 /* Define true if ipv6 is available */
 #undef GCONFIG_HAVE_IPV6

@ -81,30 +120,21 @@
 /* Define true to use deprecated mbedtls/net.h */
 #undef GCONFIG_HAVE_MBEDTLS_NET_H

+/* Define true if netdb.h is available */
+#undef GCONFIG_HAVE_NETDB_H
+
+/* Define true if netinet/in.h is available */
+#undef GCONFIG_HAVE_NETINET_IN_H
+
 /* Define true to enable openssl */
 #undef GCONFIG_HAVE_OPENSSL

 /* Define true if openssl has SSL_set_min_proto_version */
 #undef GCONFIG_HAVE_OPENSSL_MIN_MAX

-/* Define true if openssl has SSLv23_method */
-#undef GCONFIG_HAVE_OPENSSL_SSLv23_METHOD
-
-/* Define true if openssl has SSLv3_method */
-#undef GCONFIG_HAVE_OPENSSL_SSLv3_METHOD
-
 /* Define true if openssl has TLS_method */
 #undef GCONFIG_HAVE_OPENSSL_TLS_METHOD

-/* Define true if openssl has TLSv1_1_method */
-#undef GCONFIG_HAVE_OPENSSL_TLSv1_1_METHOD
-
-/* Define true if openssl has TLSv1_2_method */
-#undef GCONFIG_HAVE_OPENSSL_TLSv1_2_METHOD
-
-/* Define true if openssl has TLSv1_method */
-#undef GCONFIG_HAVE_OPENSSL_TLSv1_METHOD
-
 /* Define true to use pam */
 #undef GCONFIG_HAVE_PAM

@ -117,6 +147,9 @@
 /* Define true to include pam_appl.h from security */
 #undef GCONFIG_HAVE_PAM_IN_SECURITY

+/* Define true if pid_t is a type */
+#undef GCONFIG_HAVE_PID_T
+
 /* Define true if have OSX proc_pidpath() */
 #undef GCONFIG_HAVE_PROC_PIDPATH

@ -141,9 +174,42 @@
 /* Define true if statbuf has a st_atim.tv_nsec member */
 #undef GCONFIG_HAVE_STATBUF_NSEC

+/* Define true if stdint.h is available */
+#undef GCONFIG_HAVE_STDINT_H
+
 /* Define true if strncpy_s in string.h */
 #undef GCONFIG_HAVE_STRNCPY_S

+/* Define true if sys/mman.h is available */
+#undef GCONFIG_HAVE_SYS_MMAN_H
+
+/* Define true if sys/select.h is available */
+#undef GCONFIG_HAVE_SYS_SELECT_H
+
+/* Define true if sys/socket.h is available */
+#undef GCONFIG_HAVE_SYS_SOCKET_H
+
+/* Define true if sys/stat.h is available */
+#undef GCONFIG_HAVE_SYS_STAT_H
+
+/* Define true if sys/types.h is available */
+#undef GCONFIG_HAVE_SYS_TYPES_H
+
+/* Define true if sys/utsname.h is available */
+#undef GCONFIG_HAVE_SYS_UTSNAME_H
+
+/* Define true if sys/wait.h is available */
+#undef GCONFIG_HAVE_SYS_WAIT_H
+
+/* Define true if uid_t is a type */
+#undef GCONFIG_HAVE_UID_T
+
+/* Define true if uintptr_t type is defined stdint.h */
+#undef GCONFIG_HAVE_UINTPTR_T
+
+/* Define true if unistd.h is available */
+#undef GCONFIG_HAVE_UNISTD_H
+
 /* Define true for a windows build using the mingw tool chain */
 #undef GCONFIG_MINGW

@ -156,6 +222,42 @@
 /* define if the compiler supports basic C++11 syntax */
 #undef HAVE_CXX11

+/* Define to 1 if the system has the type `gid_t'. */
+#undef HAVE_GID_T
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if the system has the type `pid_t'. */
+#undef HAVE_PID_T
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if the system has the type `uid_t'. */
+#undef HAVE_UID_T
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT

@ -174,5 +276,8 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Define to enable debug messages at compile-time */
 #undef _DEBUG
--- a/361
+++ b/361
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile

-scriptversion=2011-11-20.07; # UTC
+scriptversion=2014-09-12.12; # UTC

 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.

+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"

-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.

-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}

 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}

-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=

 # Desired mode of installed file.
@ -97,7 +82,7 @@ dir_arg=
 dst_arg=

 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly

 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@ -137,46 +122,57 @@ while test $# -ne 0; do
    -d) dir_arg=true;;

    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;

    --help) echo "$usage"; exit $?;;

    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;

    -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;

    -s) stripcmd=$stripprog;;

-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;

-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;

    --version) echo "$0 $scriptversion"; exit $?;;

-    --)	shift
-	break;;
+    --) shift
+        break;;

-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;

    *)  break;;
  esac
  shift
 done

+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
@ -207,6 +203,15 @@ if test $# -eq 0; then
  exit 0
 fi

+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
 if test -z "$dir_arg"; then
  do_exit='(exit $ret); exit $ret'
  trap "ret=129; $do_exit" 1
@ -223,16 +228,16 @@ if test -z "$dir_arg"; then

    *[0-7])
      if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
      else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
      else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
@ -269,41 +274,15 @@ do
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
      test -d "$dstdir"
      dstdir_status=$?
    fi
@ -314,74 +293,81 @@ do
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;

-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac

-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi

-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0

-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
    esac

    if
      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
@ -391,53 +377,51 @@ do
      # directory the slow way, step by step, checking for races as we go.

      case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
      esac

-      eval "$initialize_posix_glob"
-
      oIFS=$IFS
      IFS=/
-      $posix_glob set -f
+      set -f
      set fnord $dstdir
      shift
-      $posix_glob set +f
+      set +f
      IFS=$oIFS

      prefixes=

      for d
      do
-	test X"$d" = X && continue
+        test X"$d" = X && continue

-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
      done

      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
      fi
    fi
  fi
@ -472,15 +456,12 @@ do

    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
@ -493,24 +474,24 @@ do
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&

-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1

--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@ -1,5 +1,5 @@
 #
-## Copyright (C) 2001-2018 Graeme Walker <graeme_walker@users.sourceforge.net>
+## Copyright (C) 2001-2019 Graeme Walker <graeme_walker@users.sourceforge.net>
 ##
 ## 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
@ -14,6 +14,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+
 EXTRA_DIST = \
 	pkg.m4 \
 	m4_ax_cxx_compile_stdcxx_11.m4 \
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@ -13,6 +13,9 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
+
+#
+#
 VPATH = @srcdir@
 am__is_gnu_make = { \
  if test -z '$(MAKELEVEL)'; then \
@ -87,10 +90,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
+	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4/m4_ax_cxx_compile_stdcxx_11.m4 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@ -133,6 +136,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@ -141,15 +145,13 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCONFIG_CONFIGURATION = @GCONFIG_CONFIGURATION@
 GCONFIG_HAVE_DOXYGEN = @GCONFIG_HAVE_DOXYGEN@
 GCONFIG_HAVE_MAN2HTML = @GCONFIG_HAVE_MAN2HTML@
 GCONFIG_QT_CFLAGS = @GCONFIG_QT_CFLAGS@
 GCONFIG_QT_LIBS = @GCONFIG_QT_LIBS@
 GCONFIG_QT_MOC = @GCONFIG_QT_MOC@
-GCONFIG_STATIC_END = @GCONFIG_STATIC_END@
-GCONFIG_STATIC_START = @GCONFIG_STATIC_START@
 GCONFIG_TLS_LIBS = @GCONFIG_TLS_LIBS@
 GCONFIG_WINDMC = @GCONFIG_WINDMC@
 GCONFIG_WINDRES = @GCONFIG_WINDRES@
@ -215,6 +217,7 @@ e_icondir = @e_icondir@
 e_initdir = @e_initdir@
 e_libexecdir = @e_libexecdir@
 e_pamdir = @e_pamdir@
+e_rundir = @e_rundir@
 e_spooldir = @e_spooldir@
 e_sysconfdir = @e_sysconfdir@
 exec_prefix = @exec_prefix@
@ -243,9 +246,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#
-#
 EXTRA_DIST = \
 	pkg.m4 \
 	m4_ax_cxx_compile_stdcxx_11.m4 \
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@ -1,6 +1,6 @@
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
-#
+# 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@ -123,7 +123,7 @@ if test $pkg_failed = yes; then
        _PKG_SHORT_ERRORS_SUPPORTED
        if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else
+        else 
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
        fi
 	# Put the nasty error message in config.log where it belongs
--- a/2
+++ b/2
@ -3,7 +3,7 @@

 scriptversion=2013-10-28.13; # UTC

-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

 # This program is free software; you can redistribute it and/or modify
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .0.1
 .1