v2.3

AUTHORS

@@ -21,3 +21,8 @@ websites for further details.
 
 This product includes software developed by the OpenSSL Project
 for use in the OpenSSL Toolkit (http://www.openssl.org/).
+
+Translations
+------------
+Thanks to Per-Arne Christensen for the Norwegian translation of 
+the GUI.

ChangeLog

@@ -1,11 +1,12 @@
 E-MailRelay Change Log
 ======================
 
-2.2 -> 2.2.1
+2.2 -> 2.3
-------------
+----------
 * Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
 * Windows event log not used for verbose logging (prefer "--log-file").
 * New admin 'forward' command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files ("plain:b").
 * Support for MbedTLS version 3.
 
 2.1 -> 2.2

Makefile.am

@@ -22,7 +22,7 @@
 # Additional pseudo-targets:
 #	* rpm - builds an rpm package using rpmbuild
 #	* deb - builds a deb package using debhelper
-#	* cmake - generates simplistic cmake files under ./build/
+#	* cmake - generates cmake files under ./build/
 #	* tidy - runs cmake-tidy
 #	* format - runs cmake-format
 #
@@ -41,7 +41,7 @@
 #	$ sudo make deb
 #
 # and possibly:
-#	$ make cmake ; cd build ; make
+#	$ make cmake ; make -C build
 #	$ make tidy TIDY=clang-tidy-10
 #	$ make format FORMAT=clang-format-10
 #	$ make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-testing
@@ -126,6 +126,7 @@ format:
 cmake:
 	@chmod +x bin/make2cmake || true
 	bin/make2cmake
-	mkdir build || true
+	test -d build || mkdir build
 	cd build && cmake -DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+	@echo now run make from the '"build"' directory
 

Makefile.in

@@ -24,7 +24,7 @@
 # Additional pseudo-targets:
 #	* rpm - builds an rpm package using rpmbuild
 #	* deb - builds a deb package using debhelper
-#	* cmake - generates simplistic cmake files under ./build/
+#	* cmake - generates cmake files under ./build/
 #	* tidy - runs cmake-tidy
 #	* format - runs cmake-format
 #
@@ -43,7 +43,7 @@
 #	$ sudo make deb
 #
 # and possibly:
-#	$ make cmake ; cd build ; make
+#	$ make cmake ; make -C build
 #	$ make tidy TIDY=clang-tidy-10
 #	$ make format FORMAT=clang-format-10
 #	$ make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-testing
@@ -952,8 +952,9 @@ format:
 cmake:
 	@chmod +x bin/make2cmake || true
 	bin/make2cmake
-	mkdir build || true
+	test -d build || mkdir build
 	cd build && cmake -DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+	@echo now run make from the '"build"' directory
 
 # 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.

NEWS

@@ -1,28 +1,5 @@
 News
 ----
-E-MailRelay 2.2 is now fully C++11, so older compilers will not work unless
+Version 2.3 is a relatively minor release. The main functional change is to
-they have a "-std=c++11" option or similar, and this also means that
+support unix domain sockets. Non-functional code changes include better 
-"uclibc++" is no longer supported.
+separation of interface and implementation in the SMTP message store.
-
-The behaviour with respect to the "--remote-clients" command-line option is
-changed in this release: previously IPv4 connections were allowed only from
-the host's local address, as determined by a DNS lookup, unless using
-"--remote-clients". The new implementation allows connections from any
-loopback or 'private use' address, defined in RFC-1918 and RFC-5735. This
-brings the IPv4 behaviour in line with IPv6, and it still honours the intent
-of the "--remote-clients" option in protecting the naive user against
-accidental exposore to the public internet.
-
-Some internationalisation support has been added, using gettext() for the
-main program and Qt's tr() for the GUI. See "doc/developer.txt".
-
-A systemd unit file has been added, although by default it is only installed
-as an "examples" file. Use "e_systemddir=/usr/lib/systemd/system" on the
-"./configure" command-line to have it installed by "make install".
-
-This release has a new "make tidy" option that runs "clang-tidy" over the
-code and also "make cmake" to generate simple cmake files for a unix build.
-
-Version 2.2.1 adds support for unix-domain sockets. 
-
-Thanks to Per-Arne Christensen for the Norwegian translation of the GUI.

VERSION

@@ -1 +1 @@
-2.2.1
+2.3

bin/AutoMakeParser.pm

@@ -298,7 +298,7 @@ sub simplepath
 	for my $x ( @split )
 	{
 		next if( $x eq "" || $x eq "." ) ;
-		if( $x eq ".." && scalar(@out) && @out[-1] ne ".." )
+		if( $x eq ".." && scalar(@out) && $out[-1] ne ".." )
 		{
 			pop @out ;
 		}

bin/emailrelay-bcc-check.pl

@@ -30,7 +30,7 @@ use strict ;
 use FileHandle ;
 $SIG{__DIE__} = sub { (my $e = join(" ",@_)) =~ s/\n/ /g ; print "<<error: $e>>\n" ; exit 99 } ;
 
-my $content = @ARGV[0] or die "usage error\n" ;
+my $content = $ARGV[0] or die "usage error\n" ;
 my $verbose = 1 ;
 
 # read the bcc list from the content file

bin/emailrelay-deliver.sh.in

@@ -20,7 +20,6 @@
 # setup.
 #
 
-
 store="__SPOOL_DIR__"
 postmaster="root"
 procmail="procmail"

bin/emailrelay-rot13.pl

@@ -31,7 +31,7 @@ while(<$fh_in>)
 
 	if( $in_header && ( $line =~ m/^\s/ ) && scalar(@headers) ) # folding
 	{
-		@headers[-1] .= "\r\n$line" ;
+		$headers[-1] .= "\r\n$line" ;
 	}
 	elsif( $in_header && ( $line =~ m/^$/ ) )
 	{

bin/emailrelay-set-from.pl

@@ -25,7 +25,7 @@ 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 $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 ;

bin/make-format

@@ -177,9 +177,9 @@ sub fixup
 		}
 
 		# add some more whitespace
-		$line =~ s:(\S);$:\1 ;: ;
+		$line =~ s:(\S);$:$1 ;: ;
-		$line =~ s:(\S); //(.*):\1 ; //\2: ;
+		$line =~ s:(\S); //(.*):$1 ; //$2: ;
-		$line =~ s:(\S),:\1 ,:g unless ( $line =~ m/["']/ or $line =~ m://.*,: ) ;
+		$line =~ s:(\S),:$1 ,:g unless ( $line =~ m/["']/ or $line =~ m://.*,: ) ;
 
 		print $fh_out $line , "\n" or die ;
 	}

bin/winbuild.pm

@@ -353,7 +353,8 @@ sub create_touchfile
 sub read_makefiles
 {
 	my ( $switches , $vars ) = @_ ;
-	return AutoMakeParser::readall( "." , $switches , $vars , 1 ) ;
+	my $verbose = 1 ;
+	return AutoMakeParser::readall( "." , $switches , $vars , $verbose ) ;
 }
 
 sub cache_value

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for E-MailRelay 2.2.1.
+# Generated by GNU Autoconf 2.69 for E-MailRelay 2.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='E-MailRelay'
 PACKAGE_TARNAME='emailrelay'
-PACKAGE_VERSION='2.2.1'
+PACKAGE_VERSION='2.3'
-PACKAGE_STRING='E-MailRelay 2.2.1'
+PACKAGE_STRING='E-MailRelay 2.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -657,8 +657,6 @@ GCONFIG_TESTING_FALSE
 GCONFIG_TESTING_TRUE
 GCONFIG_MAC_FALSE
 GCONFIG_MAC_TRUE
-GCONFIG_IPV6_FALSE
-GCONFIG_IPV6_TRUE
 GCONFIG_INTERFACE_NAMES_FALSE
 GCONFIG_INTERFACE_NAMES_TRUE
 GCONFIG_INSTALL_HOOK_FALSE
@@ -796,7 +794,6 @@ enable_epoll
 enable_gui
 enable_install_hook
 enable_interface_names
-enable_ipv6
 enable_mac
 enable_std_thread
 enable_testing
@@ -1378,7 +1375,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures E-MailRelay 2.2.1 to adapt to many kinds of systems.
+\`configure' configures E-MailRelay 2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1445,7 +1442,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of E-MailRelay 2.2.1:";;
+     short | recursive ) echo "Configuration of E-MailRelay 2.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1473,7 +1470,6 @@ Optional Features:
   --enable-interface-names
                           allow network interface names for defining listening
                           addresses (default yes)
-  --enable-ipv6           enable ipv6 (default auto)
   --enable-mac            enable building for mac os x (default auto)
   --enable-std-thread     use std::thread or not (default auto)
   --enable-testing        enable make check tests (default yes)
@@ -1579,7 +1575,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-E-MailRelay configure 2.2.1
+E-MailRelay configure 2.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2015,7 +2011,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by E-MailRelay $as_me 2.2.1, which was
+It was created by E-MailRelay $as_me 2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2880,7 +2876,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='emailrelay'
- VERSION='2.2.1'
+ VERSION='2.3'
 
 
 # Some tools Automake needs.
@@ -9368,52 +9364,6 @@ else
 fi
 
 
-# Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then :
-  enableval=$enable_ipv6;
-fi
-
-
-	if test "$enable_ipv6" = "no"
-	then
-		gconfig_use_ipv6="no"
-	else
-		if test "$gconfig_cv_ipv6" = "no"
-		then
-			if test "$enable_ipv6" = "yes"
-			then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring --enable-ipv6" >&5
-$as_echo "$as_me: WARNING: ignoring --enable-ipv6" >&2;}
-			fi
-			gconfig_use_ipv6="no"
-		else
-			gconfig_use_ipv6="yes"
-		fi
-	fi
-
-	if test "$enable_ipv6" != "no" -a "$gconfig_use_ipv6" = "no"
-	then
-		gconfig_warnings="$gconfig_warnings ipv6_ipv6_networking"
-	fi
-
-	if test "$gconfig_use_ipv6" = "yes" ; then
-
-$as_echo "#define GCONFIG_ENABLE_IPV6 1" >>confdefs.h
-
-	else
-
-$as_echo "#define GCONFIG_ENABLE_IPV6 0" >>confdefs.h
-
-	fi
-	 if test "$gconfig_use_ipv6" = "yes"; then
-  GCONFIG_IPV6_TRUE=
-  GCONFIG_IPV6_FALSE='#'
-else
-  GCONFIG_IPV6_TRUE='#'
-  GCONFIG_IPV6_FALSE=
-fi
-
-
 # Check whether --enable-mac was given.
 if test "${enable_mac+set}" = set; then :
   enableval=$enable_mac;
@@ -10337,10 +10287,6 @@ if test -z "${GCONFIG_INTERFACE_NAMES_TRUE}" && test -z "${GCONFIG_INTERFACE_NAM
   as_fn_error $? "conditional \"GCONFIG_INTERFACE_NAMES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GCONFIG_IPV6_TRUE}" && test -z "${GCONFIG_IPV6_FALSE}"; then
-  as_fn_error $? "conditional \"GCONFIG_IPV6\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${GCONFIG_MAC_TRUE}" && test -z "${GCONFIG_MAC_FALSE}"; then
   as_fn_error $? "conditional \"GCONFIG_MAC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -10782,7 +10728,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by E-MailRelay $as_me 2.2.1, which was
+This file was extended by E-MailRelay $as_me 2.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10848,7 +10794,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-E-MailRelay config.status 2.2.1
+E-MailRelay config.status 2.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -19,7 +19,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT([E-MailRelay],[2.2.1],[],[emailrelay])
+AC_INIT([E-MailRelay],[2.3],[],[emailrelay])
 AC_CONFIG_SRCDIR([src/glib/gdef.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([no-define])
@@ -90,8 +90,6 @@ AC_ARG_ENABLE([install-hook],AS_HELP_STRING([--enable-install-hook],[enable fixi
 GCONFIG_FN_ENABLE_INSTALL_HOOK
 AC_ARG_ENABLE([interface-names],AS_HELP_STRING([--enable-interface-names],[allow network interface names for defining listening addresses (default yes)]))
 GCONFIG_FN_ENABLE_INTERFACE_NAMES
-AC_ARG_ENABLE([ipv6],AS_HELP_STRING([--enable-ipv6],[enable ipv6 (default auto)]))
-GCONFIG_FN_ENABLE_IPV6
 AC_ARG_ENABLE([mac],AS_HELP_STRING([--enable-mac],[enable building for mac os x (default auto)]))
 GCONFIG_FN_ENABLE_MAC
 AC_ARG_ENABLE([std-thread],AS_HELP_STRING([--enable-std-thread],[use std::thread or not (default auto)]))

configure.sh

@@ -117,10 +117,10 @@ then
 fi
 if test -d "$MBEDTLS_DIR"
 then
-	echo "configure.sh: mbedtls directory exists: adding --with-mbedtls and CPPFLAGS=-I$MBEDTLS_DIR/include etc"
+	echo "configure.sh: mbedtls directory exists: adding --with-mbedtls and CXXFLAGS=-I$MBEDTLS_DIR/include etc"
 	with_mbedtls="--with-mbedtls"
 	make_mbedtls=1
-	export CPPFLAGS="$CPPFLAGS -I`pwd`/$MBEDTLS_DIR/include"
+	export CXXFLAGS="$CXXFLAGS -I`pwd`/$MBEDTLS_DIR/include"
 	export LDFLAGS="$LDFLAGS -L`pwd`/$MBEDTLS_DIR/library"
 fi
 
@@ -139,7 +139,7 @@ then
 	export GCONFIG_WINDMC="$TARGET-windmc"
 	export GCONFIG_WINDRES="$TARGET-windres"
 	export CXXFLAGS="$CXXFLAGS -std=c++11 -pthread"
-	#export CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501" eg. for Windows XP, otherwise whatever mingw defaults to
+	#export CXXFLAGS="$CXXFLAGS -D_WIN32_WINNT=0x0501" eg. for Windows XP, otherwise whatever mingw defaults to
 	export LDFLAGS="$LDFLAGS -pthread"
 	if test -x "`which $CXX`" ; then : ; else echo "error: no mingw c++ compiler: [$CXX]\n" ; exit 1 ; fi
 	( echo msbuild . ; echo qt-x86 . ; echo qt-x64 . ; echo cmake . ; echo msvc . ) > winbuild.cfg
@@ -193,7 +193,7 @@ then
 	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 CPPFLAGS="$CPPFLAGS -DG_SMALL"
+	export CXXFLAGS="$CXXFLAGS -DG_SMALL"
 	export LDFLAGS="$LDFLAGS -static"
 	export LIBS="-lgcc_eh"
 	if test -x "$CXX" ; then : ; else echo "error: no c++ compiler for target [$TARGET]: CXX=[$CXX]\n" ; exit 1 ; fi
@@ -212,7 +212,7 @@ then
 :
 elif test "`uname`" = "NetBSD"
 then
-	export CPPFLAGS="$CPPFLAGS -I/usr/X11R7/include"
+	export CXXFLAGS="$CXXFLAGS -I/usr/X11R7/include"
 	export LDFLAGS="$LDFLAGS -L/usr/X11R7/lib"
 	$thisdir/configure $enable_debug $with_mbedtls \
 		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
@@ -220,7 +220,7 @@ then
 :
 elif test "`uname`" = "FreeBSD"
 then
-	export CPPFLAGS="$CPPFLAGS -I/usr/local/include -I/usr/local/include/libav"
+	export CXXFLAGS="$CXXFLAGS -I/usr/local/include -I/usr/local/include/libav"
 	export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/local/lib/libav"
 	$thisdir/configure $enable_debug $with_mbedtls \
 		--prefix=/usr/local --mandir=/usr/local/man \
@@ -228,7 +228,7 @@ then
 :
 elif test "`uname`" = "OpenBSD"
 then
-	export CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+	export CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
 	export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
 	$thisdir/configure $enable_debug $with_mbedtls \
 		--prefix=/usr/local --mandir=/usr/local/man \
@@ -236,14 +236,14 @@ then
 :
 elif test "`uname`" = "Darwin"
 then
-	export CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/X11/include"
+	export CXXFLAGS="$CXXFLAGS -I/opt/local/include -I/opt/X11/include"
 	export LDFLAGS="$LDFLAGS -L/opt/local/lib -L/opt/X11/lib"
 	$thisdir/configure $enable_debug $with_mbedtls \
 		--prefix=/opt/local --mandir=/opt/local/man $opt_passthrough "$@"
 :
 elif test "`uname`" = "Linux"
 then
-	export CPPFLAGS
+	export CXXFLAGS
 	export LDFLAGS
 	$thisdir/configure $enable_debug $with_mbedtls \
 		--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
@@ -251,7 +251,7 @@ then
 		$opt_passthrough 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 CXXFLAGS="$CXXFLAGS -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 $enable_debug $with_mbedtls $opt_passthrough "$@"
 fi

debian/changelog

@@ -1,7 +1,8 @@
-emailrelay (2.2.1) unstable; urgency=low
+emailrelay (2.3) unstable; urgency=low
   * Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
   * Windows event log not used for verbose logging (prefer "--log-file").
   * New admin 'forward' command to trigger forwarding without waiting.
+  * Optional base64 encoding of passwords in secrets files ("plain:b").
   * Support for MbedTLS version 3.
  -- maintainer graeme_walker <graeme_walker@users.sourceforge.net>  Tue, 14 Feb 2022 00:00:00 +0000
 
@@ -27,7 +28,7 @@ emailrelay (2.1) unstable; urgency=low
   * 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.
+  * Message files can be edited 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.

debian/postinst

@@ -27,7 +27,7 @@ emailrelay_fix_html()
 
 emailrelay_create_config()
 {
-	if test ! -f /etc/emailrelay.conf -a -f /etc/emailrelay.conf.template
+	if test ! -e /etc/emailrelay.conf -a -f /etc/emailrelay.conf.template
 	then
 		cp /etc/emailrelay.conf.template /etc/emailrelay.conf
 	fi

doc/changelog.html

@@ -9,11 +9,12 @@
   <!-- 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:E-MailRelay Change Log -->
-   <h2><a class="a-header" name="SH_1_1">2.2 -> 2.2.1</a></h2> <!-- index:2:SH:1:1:2.2 -> 2.2.1 -->
+   <h2><a class="a-header" name="SH_1_1">2.2 -> 2.3</a></h2> <!-- index:2:SH:1:1:2.2 -> 2.3 -->
     <ul>
      <li>Unix domain sockets supported (eg. <em>--interface=/tmp/smtp.s</em>.</li>
      <li>Windows event log not used for verbose logging (prefer <em>--log-file</em>).</li>
      <li>New admin <em>forward</em> command to trigger forwarding without waiting.</li>
+     <li>Optional base64 encoding of passwords in secrets files (<em>plain:b</em>).</li>
      <li>Support for MbedTLS version 3.</li>
     </ul>
    <h2><a class="a-header" name="SH_1_2">2.1 -> 2.2</a></h2> <!-- index:2:SH:1:2:2.1 -> 2.2 -->

doc/changelog.md

@@ -1,12 +1,13 @@
 E-MailRelay Change Log
 ======================
 
-2.2 -> 2.2.1
+2.2 -> 2.3
-------------
+----------
 
 * Unix domain sockets supported (eg. `--interface=/tmp/smtp.s`).
 * Windows event log not used for verbose logging (prefer `--log-file`).
 * New admin `forward` command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files (`plain:b`).
 * Support for MbedTLS version 3.
 
 2.1 -> 2.2
@@ -34,7 +35,7 @@ E-MailRelay Change Log
 * 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.
+* Message files can be edited 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.

doc/changelog.rst

@@ -2,12 +2,13 @@
 E-MailRelay Change Log
 **********************
 
-2.2 -> 2.2.1
+2.2 -> 2.3
-============
+==========
 
 * Unix domain sockets supported (eg. *--interface=/tmp/smtp.s*).
 * Windows event log not used for verbose logging (prefer *--log-file*).
 * New admin *forward* command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files (*plain:b*).
 * Support for MbedTLS version 3.
 
 2.1 -> 2.2

doc/changelog.txt

@@ -1,11 +1,12 @@
 E-MailRelay Change Log
 ======================
 
-2.2 -> 2.2.1
+2.2 -> 2.3
-------------
+----------
 * Unix domain sockets supported (eg. "--interface=/tmp/smtp.s").
 * Windows event log not used for verbose logging (prefer "--log-file").
 * New admin "forward" command to trigger forwarding without waiting.
+* Optional base64 encoding of passwords in secrets files ("plain:b").
 * Support for MbedTLS version 3.
 
 2.1 -> 2.2

doc/conf.py.sphinx

@@ -7,10 +7,10 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'E-MailRelay'
-copyright = u'2021, Graeme Walker'
+copyright = u'2022, Graeme Walker'
 author = u'Graeme Walker'
-version = u'2.2'
+version = u'2.3'
-release = u'2.2'
+release = u'2.3'
 language = None
 today_fmt = '%Y-%m-%d'
 exclude_patterns = []

doc/emailrelay-man.html

@@ -195,7 +195,7 @@ Displays help text and then exits. Use with <I>--verbose</I> for more complete o
 <DT><B>-H, --hidden</B>
 
 <DD>
-Windows only. Hides the application window and disables all message boxes, overriding any <I></I><I>--show</I><I></I> option. This is useful when running  as a windows service.
+Windows only. Hides the application window and disables all message boxes, overriding any <I>--show</I> option. This is useful when running as a windows service.
 <DT><B>--idle-timeout </B><I>&lt;time&gt;</I>
 
 <DD>
@@ -211,7 +211,7 @@ Specifies the IP network addresses or interface names used to bind listening por
 <DT><B>--localedir </B><I>&lt;dir&gt;</I>
 
 <DD>
-Specifies a locale base directory where localisation message catalogues  can be found. An empty directory can be used for the built-in default.
+Enables localisation and specifies the locale base directory where message catalogues can be found. An empty directory can be used for the built-in default.
 <DT><B>-l, --log</B>
 
 <DD>
@@ -331,7 +331,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. Specify <I>root</I> to disable all user-id switching. Ignored on Windows.
+When started as root the program switches to a non-privileged effective user-id when idle. This option can be used to define the idle user-id and also the group ownership of new files and sockets. Specify <I>root</I> to  disable all user-id switching. Ignored on Windows.
 <DT><B>-v, --verbose</B>
 
 <DD>
@@ -366,7 +366,8 @@ Graeme Walker, mailto:<A HREF="mailto:graeme_walker@users.sourceforge.net">graem
 </DL>
 <HR>
 This document was created by
-<A HREF="lynxcgi:./cgi-bin/man/man2html">man2html</A>,
+<A HREF="lynxcgi:FOO/cgi-bin/man/man2html">man2html</A>,
 using the manual pages.<BR>
 </BODY>
 </HTML>
+<!-- Copyright (C) 2001-2021 Graeme Walker <graeme_walker@users.sourceforge.net>. All rights reserved. -->

doc/emailrelay.1

@@ -146,7 +146,7 @@ Allow forwarding to continue even if some recipient addresses on an e-mail envel
 Displays help text and then exits. Use with \fI--verbose\fR for more complete output.
 .TP
 .B \-H, --hidden
-Windows only. Hides the application window and disables all message boxes, overriding any \fI\fR\fI--show\fR\fI\fR option. This is useful when running  as a windows service.
+Windows only. Hides the application window and disables all message boxes, overriding any \fI--show\fR option. 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.
@@ -158,7 +158,7 @@ Causes mail messages to be forwarded as they are received, even before they have
 Specifies the IP network addresses or interface names 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. 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. Any link-local IPv6 addresses must include a zone name or scope id.  Interface names can be used instead of addresses, in which case all the addresses associated with that interface at startup will used for listening. When an interface name is decorated with a \fI-ipv4\fR or \fI-ipv6\fR suffix only their IPv4 or IPv6 addresses will be used (eg. \fIppp0-ipv4\fR).
 .TP
 .B --localedir \fI<dir>\fR
-Specifies a locale base directory where localisation message catalogues  can be found. An empty directory can be used for the built-in default.
+Enables localisation and specifies the locale base directory where message catalogues can be found. An empty directory can be used for the built-in default.
 .TP
 .B \-l, --log
 Enables logging to the standard error stream and to the syslog. The \fI--close-stderr\fR and \fI--no-syslog\fR options can be used to disable output to standard error stream and the syslog separately. Note that \fI--as-server\fR, \fI--as-client\fR and \fI--as-proxy\fR imply \fI--log\fR, and \fI--as-server\fR and \fI--as-proxy\fR also imply \fI--close-stderr\fR.
@@ -248,7 +248,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. Specify \fIroot\fR to disable all user-id switching. Ignored on Windows.
+When started as root the program switches to a non-privileged effective user-id when idle. This option can be used to define the idle user-id and also the group ownership of new files and sockets. 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.

doc/reference.html

@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "%-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 <html>
  <head>
   <title>E-MailRelay Reference</title>
@@ -8,7 +8,7 @@
  <body>
   <!-- index:0::::E-MailRelay Reference -->
  <div class="div-main">
-  <h1><a class="a-header" name="H_1">E-MailRelay Reference</a></h1> <!-- index:1:H:1::E-MailRelay Reference -->
+  <h1><a class="a-header" name="H_1">E-MailRelay Reference</a></h1> <!-- index:1:H:E-MailRelay Reference -->
    <h2><a class="a-header" name="SH_1_1">Command line usage</a></h2> <!-- index:2:SH:1:1:Command line usage -->
     <p>
      The <em>emailrelay</em> program supports the following command-line usage:
@@ -224,7 +224,7 @@
      <dt>--hidden (-H)</dt>
       <dd>
        Windows only. Hides the application window and disables all message boxes,
-       overriding any <em></em>--show<em></em> option. This is useful when running  as a windows
+       overriding any <em>--show</em> option. This is useful when running as a windows
        service.
       </dd>
      <dt>--idle-timeout &lt;time&gt;</dt>
@@ -255,8 +255,9 @@
       </dd>
      <dt>--localedir &lt;dir&gt;</dt>
       <dd>
-       Specifies a locale base directory where localisation message catalogues  can
+       Enables localisation and specifies the locale base directory where message
-       be found. An empty directory can be used for the built-in default.
+       catalogues can be found. An empty directory can be used for the built-in
+       default.
       </dd>
      <dt>--log (-l)</dt>
       <dd>
@@ -437,9 +438,10 @@
       </dd>
      <dt>--user &lt;username&gt; (-u)</dt>
       <dd>
-       When started as root the program switches to an non-privileged effective
+       When started as root the program switches to a non-privileged effective
-       user-id when idle. This option can be used to define which user-id is used.
+       user-id when idle. This option can be used to define the idle user-id and
-       Specify <em>root</em> to disable all user-id switching. Ignored on Windows.
+       also the group ownership of new files and sockets. Specify <em>root</em> to
+       disable all user-id switching. Ignored on Windows.
       </dd>
      <dt>--verbose (-v)</dt>
       <dd>
@@ -503,7 +505,7 @@
      <li>as each message is submitted, just before receipt is acknowledged (<em>--immediate</em>)</li>
      <li>as soon as the submitting client connection disconnects (<em>--forward-on-disconnect</em>)</li>
      <li>periodically (<em>--poll=<seconds></em>)</li>
-     <li>on demand using the administration interface's <em>flush</em> command (<em>--admin=<port></em>)</li>
+     <li>on demand using the administration interface's <em>forward</em> command (<em>--admin=<port></em>)</li>
      <li>when a <em>--filter</em> script exits with an exit code of 103</li>
     </ul>
 
@@ -753,13 +755,20 @@ emailrelay --as-client=example.com:smtp --client-auth=/etc/emailrelay-server.aut
     </p>
 
     <p>
-     The first two fields are case-insensitive. The <em>xtext</em> encoding scheme is
+     The <em>xtext</em> encoding scheme is defined properly in RFC-3461, but basically it
-     defined properly in RFC-3461, but basically it says that non-alphanumeric
+     says that non-alphanumeric characters (including space, <em>+</em>, <em>#</em> and <em>=</em>) should
-     characters (including space, <em>+</em>, <em>#</em> and <em>=</em>) should be represented in
+     be represented in uppercase hexadecimal ascii as <em>+XX</em>. So a space should be
-     uppercase hexadecimal ascii as <em>+XX</em>. So a space should be written as <em>+20</em>;
+     written as <em>+20</em>; <em>+</em> as <em>+2B</em>; <em>#</em> as <em>+23</em>; and <em>=</em> as <em>+3D</em>.
-     <em>+</em> as <em>+2B</em>; <em>#</em> as <em>+23</em>; and <em>=</em> as <em>+3D</em>. Also note that modern email
+    </p>
-     services will expect userids and passwords containing non-ASCII characters to
+
-     use UTF-8 encoding with RFC-4013 normalisation applied.
+    <p>
+     Base64 encoding can be used instead of xtext encoding for the user identifier
+     and plain password by replacing <em>plain</em> by <em>plain:b</em>.
+    </p>
+
+    <p>
+     Note that modern email services will expect userids and passwords containing
+     non-ASCII characters to use UTF-8 encoding with RFC-4013 normalisation applied.
     </p>
 
     <p>
@@ -775,10 +784,10 @@ emailrelay --as-client=example.com:smtp --client-auth=/etc/emailrelay-server.aut
     <p>
      The PLAIN, LOGIN and CRAM-MD5 mechanisms can use plaintext passwords, stored
      in the secrets file using a password-type of <em>plain</em>. In addition, the
-     CRAM-MD5 mechanism can also use hashed passwords generated by the
+     CRAM-MD5 mechanism can also make use of hashed passwords generated by the
      <em>emailrelay-passwd</em> program and these are stored in the secrets file with a
      password-type of <em>md5</em>. (Hashed passwords are marginally more secure because
-     the plaintext password which might be used on other accounts, is not easily
+     the plaintext password which might be used on other accounts is not easily
      recovered. However, hashed passwords can only be used for HMAC authentication
      mechanisms that are based on the same hash function.) The XOAUTH2 mechanism
      can be used for client-side authentication using tokens that have been
@@ -872,10 +881,10 @@ server plain carol my+20password
     </p>
    <h2><a class="a-header" name="SH_1_6">TLS encryption</a></h2> <!-- index:2:SH:1:6:TLS encryption -->
     <p>
-     E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: to enable
+     E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: use the
-     client-side TLS encryption when E-MailRelay is acting as an SMTP client use the
+     <em>--client-tls</em> command-line option to enable client-side TLS encryption when
-     <em>--client-tls</em> command-line option, and to enable server-side TLS when
+     E-MailRelay is acting as an SMTP client, and use <em>--server-tls</em> to enable
-     E-MailRelay is acting as an SMTP or POP server use <em>--server-tls</em>. The
+     server-side TLS when E-MailRelay is acting as an SMTP or POP server. The
      connections start off as unencrypted and the SMTP command <em>STARTTLS</em> (or the
      POP <em>STLS</em> command) can be used to negotiate TLS encryption before any
      passwords are exchanged.
@@ -1083,7 +1092,7 @@ password required pam_deny.so
        <pre>--as-client ipv4or6.example.com:25 --client-interface 0.0.0.0
 --as-client ipv4or6.example.com:25 --client-interface ::</pre>
       </div><!-- div-pre -->
-   <h2><a class="a-header" name="SH_1_99">Unix domain sockets</a></h2> <!-- index:2:SH:1:99:Unix domain sockets -->
+   <h2><a class="a-header" name="SH_1_9">Unix domain sockets</a></h2> <!-- index:2:SH:1:9:Unix domain sockets -->
     <p>
      E-MailRelay on Unix will listen on unix-domain sockets instead of IPv4 or IPv6
      if the <em>--interface</em> option is given as an absolute file-system path:
@@ -1093,31 +1102,37 @@ password required pam_deny.so
      Eg:
     </p>
       <div class="div-pre">
-       <pre>--interface=/run/smtp.s --port=0</pre>
+       <pre>--interface=/run/smtp.s --port=0
+</pre>
       </div><!-- div-pre -->
     <p>
      When listening on more than one unix-domain socket use the extended form of the
-     "--interface" option with a prefix of "smtp=", "pop=", or "admin=":
+     <em>--interface</em> option with a prefix of <em>smtp=</em>, <em>pop=</em>, or <em>admin=</em>:
     </p>
+
     <p>
      Eg:
     </p>
       <div class="div-pre">
-       <pre>--interface=smtp=/run/smtp.s --port=0 --interface=pop=/run/pop.s --pop --pop-port=0</pre>
+       <pre>--interface=smtp=/run/smtp.s --port=0 --interface=pop=/run/pop.s --pop --pop-port=0
+</pre>
       </div><!-- div-pre -->
     <p>
      The forwarding address can also be a unix-domain address:
     </p>
+
     <p>
      Eg:
     </p>
       <div class="div-pre">
-       <pre>--forward-to=/run/smtp.s</pre>
+       <pre>--forward-to=/run/smtp.s
+</pre>
       </div><!-- div-pre -->
     <p>
      And it is also possible to communicate with message filters over a unix-domain
      socket:
     </p>
+
     <p>
      Eg:
     </p>
@@ -1126,7 +1141,7 @@ password required pam_deny.so
 --filter=spam:/run/spamd.s
 --filter=spam-edit:/run/spamd.s</pre>
       </div><!-- div-pre -->
-   <h2><a class="a-header" name="SH_1_9">SOCKS</a></h2> <!-- index:2:SH:1:9:SOCKS -->
+   <h2><a class="a-header" name="SH_1_10">SOCKS</a></h2> <!-- index:2:SH:1:10:SOCKS -->
     <p>
      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,
@@ -1147,7 +1162,7 @@ password required pam_deny.so
      establish the connection. The target SMTP server will see a connection coming
      from the Tor exit node rather than from the E-MailRelay server.
     </p>
-   <h2><a class="a-header" name="SH_1_10">Address verification</a></h2> <!-- index:2:SH:1:10:Address verification -->
+   <h2><a class="a-header" name="SH_1_11">Address verification</a></h2> <!-- index:2:SH:1:11:Address verification -->
     <p>
      By default the E-MailRelay server will accept all recipient addresses for
      incoming e-mails as valid. This default behaviour can be modified by using an
@@ -1350,7 +1365,7 @@ catch( e )
      information as returned by verifier scripts but in reverse, such as
      <em>0|postmaster|Local Postmaster <postmaster@eg.com></em> or <em>2|mailbox unavailable</em>.
     </p>
-   <h2><a class="a-header" name="SH_1_11">Connection blocking</a></h2> <!-- index:2:SH:1:11:Connection blocking -->
+   <h2><a class="a-header" name="SH_1_12">Connection blocking</a></h2> <!-- index:2:SH:1:12:Connection blocking -->
     <p>
      All incoming connections from remote network addresses are blocked by default,
      but can be allowed by using the <em>--remote-clients</em>/<em>-r</em> option. This is to
@@ -1390,7 +1405,7 @@ catch( e )
      Connections from loopback and private (RFC-1918) network addresses are never
      checked.
     </p>
-   <h2><a class="a-header" name="SH_1_12">Security issues</a></h2> <!-- index:2:SH:1:12:Security issues -->
+   <h2><a class="a-header" name="SH_1_13">Security issues</a></h2> <!-- index:2:SH:1:13:Security issues -->
     <p>
      The following are some security issues that have been taken into consideration:
     </p>
@@ -1477,7 +1492,7 @@ catch( e )
      The <em>Authentication</em>, <em>PAM Authentication</em> and <em>TLS encryption</em> sections
      above also relate to security.
     </p>
-   <h2><a class="a-header" name="SH_1_13">Administration interface</a></h2> <!-- index:2:SH:1:13:Administration interface -->
+   <h2><a class="a-header" name="SH_1_14">Administration interface</a></h2> <!-- index:2:SH:1:14:Administration interface -->
     <p>
      If enabled with the <em>--admin</em> command-line option, the E-MailRelay server will
      provide a network interface for performing administration tasks. This is a
@@ -1492,9 +1507,18 @@ E-MailRelay&gt; quit
 </pre>
       </div><!-- div-pre -->
     <p>
-     The <em>flush</em> command is used to get the E-MailRelay server to forward spooled
+     The <em>forward</em> command is used to trigger the E-MailRelay server into forwarding
-     mail to the next SMTP server. The <em>forward</em> command does the same but without
+     spooled mail to the next SMTP server.
-     waiting for completion.
+    </p>
+
+    <p>
+     The <em>flush</em> command is similar but it uses its own connection to the SMTP
+     server and waits for the messages to be sent.
+    </p>
+
+    <p>
+     The <em>unfail-all</em> command can be used to remove the <em>.bad</em> filename extension
+     from files in the spool directory.
     </p>
 
     <p>
@@ -1502,7 +1526,7 @@ E-MailRelay&gt; quit
      network status information and activity statistics, and <em>notify</em> enables
      asynchronous event notification.
     </p>
-   <h2><a class="a-header" name="SH_1_14">Bcc handling</a></h2> <!-- index:2:SH:1:14:Bcc handling -->
+   <h2><a class="a-header" name="SH_1_15">Bcc handling</a></h2> <!-- index:2:SH:1:15:Bcc handling -->
     <p>
      E-MailRelay transfers e-mail messages without changing their content in any
      way, other than by adding a <em>Received</em> header. In particular, if a message
@@ -1523,7 +1547,7 @@ E-MailRelay&gt; quit
      An E-MailRelay <em>--filter</em> script can be used to reject messages with incorrect
      <em>Bcc:</em> headers, and an example script is included.
     </p>
-   <h2><a class="a-header" name="SH_1_15">Files and directories</a></h2> <!-- index:2:SH:1:15:Files and directories -->
+   <h2><a class="a-header" name="SH_1_16">Files and directories</a></h2> <!-- index:2:SH:1:16:Files and directories -->
     <p>
      On Unix-like systems E-MailRelay installs by default under <em>/usr/local</em>, but
      binary distributions will probably have been built to install elsewhere.
@@ -1569,7 +1593,7 @@ E-MailRelay&gt; quit
      It is possible to change the installation root directory after building by
      using <em>make DESTDIR=<root> install</em> or <em>DESTDIR=<root> make -e install</em>.
      However, this will not change the default spool directory path built into the
-     scripts and executables so the correct spool directory will have to be
+     scripts and executables so the correct spool directory will then have to be
      specified at run-time with the <em>--spool-dir</em> command-line option.
     </p>
 

doc/reference.md

@@ -241,8 +241,9 @@ where <option> is:
 
 *   \-\-localedir <dir>
 
-    Specifies a locale base directory where localisation message catalogues  can
+    Enables localisation and specifies the locale base directory where message
-    be found. An empty directory can be used for the built-in default.
+    catalogues can be found. An empty directory can be used for the built-in
+    default.
 
 *   \-\-log (-l)
 
@@ -423,9 +424,10 @@ where <option> is:
 
 *   \-\-user <username> (-u)
 
-    When started as root the program switches to an non-privileged effective
+    When started as root the program switches to a non-privileged effective
-    user-id when idle. This option can be used to define which user-id is used.
+    user-id when idle. This option can be used to define the idle user-id and
-    Specify `root` to disable all user-id switching. Ignored on Windows.
+    also the group ownership of new files and sockets. Specify `root` to
+    disable all user-id switching. Ignored on Windows.
 
 *   \-\-verbose (-v)
 
@@ -475,7 +477,7 @@ command-line options:
 * as each message is submitted, just before receipt is acknowledged (`--immediate`)
 * as soon as the submitting client connection disconnects (`--forward-on-disconnect`)
 * periodically (`--poll=<seconds>`)
-* on demand using the administration interface's `flush` command (`--admin=<port>`)
+* on demand using the administration interface's `forward` command (`--admin=<port>`)
 * when a `--filter` script exits with an exit code of 103
 
 These can be mixed.
@@ -660,13 +662,16 @@ 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
+The `xtext` encoding scheme is defined properly in [RFC-3461][], but basically it
-defined properly in [RFC-3461][], but basically it says that non-alphanumeric
+says that non-alphanumeric characters (including space, `+`, `#` and `=`) should
-characters (including space, `+`, `#` and `=`) should be represented in
+be represented in uppercase hexadecimal ascii as `+XX`. So a space should be
-uppercase hexadecimal ascii as `+XX`. So a space should be written as `+20`;
+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
+Base64 encoding can be used instead of xtext encoding for the user identifier
-use UTF-8 encoding with [RFC-4013][] normalisation applied.
+and plain password by replacing `plain` by `plain:b`.
+
+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
@@ -678,10 +683,10 @@ available via PAM (see below).
 
 The PLAIN, LOGIN and CRAM-MD5 mechanisms can use plaintext passwords, stored
 in the secrets file using a password-type of `plain`. In addition, the
-CRAM-MD5 mechanism can also use hashed passwords generated by the
+CRAM-MD5 mechanism can also make use of hashed passwords generated by the
 `emailrelay-passwd` program and these are stored in the secrets file with a
 password-type of `md5`. (Hashed passwords are marginally more secure because
-the plaintext password which might be used on other accounts, is not easily
+the plaintext password which might be used on other accounts is not easily
 recovered. However, hashed passwords can only be used for HMAC authentication
 mechanisms that are based on the same hash function.) The XOAUTH2 mechanism
 can be used for client-side authentication using tokens that have been
@@ -753,10 +758,10 @@ described below.
 
 TLS encryption
 --------------
-E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: to enable
+E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: use the
-client-side TLS encryption when E-MailRelay is acting as an SMTP client use the
+`--client-tls` command-line option to enable client-side TLS encryption when
-`--client-tls` command-line option, and to enable server-side TLS when
+E-MailRelay is acting as an SMTP client, and use `--server-tls` to enable
-E-MailRelay is acting as an SMTP or POP server use `--server-tls`. The
+server-side TLS when E-MailRelay is acting as an SMTP or POP server. The
 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.
@@ -1214,9 +1219,14 @@ simple command-line interface which is compatible with `netcat` and `telnet`:
         E-MailRelay> help
         E-MailRelay> quit
 
-The `flush` command is used to get the E-MailRelay server to forward spooled
+The `forward` command is used to trigger the E-MailRelay server into forwarding
-mail to the next SMTP server. The `forward` command does the same but without
+spooled mail to the next SMTP server.
-waiting for completion.
+
+The `flush` command is similar but it uses its own connection to the SMTP
+server and waits for the messages to be sent.
+
+The `unfail-all` command can be used to remove the `.bad` filename extension
+from files in the spool directory.
 
 The `list` command lists the messages in the spool directory, `status` provides
 network status information and activity statistics, and `notify` enables
@@ -1274,7 +1284,7 @@ Standard ([FHS][]) use this configure command:
 It is possible to change the installation root directory after building by
 using `make DESTDIR=<root> install` or `DESTDIR=<root> make -e install`.
 However, this will not change the default spool directory path built into the
-scripts and executables so the correct spool directory will have to be
+scripts and executables so the correct spool directory will then have to be
 specified at run-time with the `--spool-dir` command-line option.
 
 On Windows the installation GUI prompts for two installation directories,

doc/reference.rst

@@ -244,8 +244,9 @@ where \<option\> is:
 
 *   --localedir \<dir\>
 
-    Specifies a locale base directory where localisation message catalogues  can
+    Enables localisation and specifies the locale base directory where message
-    be found. An empty directory can be used for the built-in default.
+    catalogues can be found. An empty directory can be used for the built-in
+    default.
 
 *   --log (-l)
 
@@ -426,9 +427,10 @@ where \<option\> is:
 
 *   --user \<username\> (-u)
 
-    When started as root the program switches to an non-privileged effective
+    When started as root the program switches to a non-privileged effective
-    user-id when idle. This option can be used to define which user-id is used.
+    user-id when idle. This option can be used to define the idle user-id and
-    Specify *root* to disable all user-id switching. Ignored on Windows.
+    also the group ownership of new files and sockets. Specify *root* to
+    disable all user-id switching. Ignored on Windows.
 
 *   --verbose (-v)
 
@@ -478,7 +480,7 @@ command-line options:
 * as each message is submitted, just before receipt is acknowledged (\ *--immediate*\ )
 * as soon as the submitting client connection disconnects (\ *--forward-on-disconnect*\ )
 * periodically (\ *--poll=<seconds>*\ )
-* on demand using the administration interface's *flush* command (\ *--admin=<port>*\ )
+* on demand using the administration interface's *forward* command (\ *--admin=<port>*\ )
 * when a *--filter* script exits with an exit code of 103
 
 These can be mixed.
@@ -675,13 +677,16 @@ 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
+The *xtext* encoding scheme is defined properly in RFC-3461_, but basically it
-defined properly in RFC-3461_, but basically it says that non-alphanumeric
+says that non-alphanumeric characters (including space, *+*, *#* and *=*) should
-characters (including space, *+*, *#* and *=*) should be represented in
+be represented in uppercase hexadecimal ascii as *+XX*. So a space should be
-uppercase hexadecimal ascii as *+XX*. So a space should be written as *+20*;
+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
+Base64 encoding can be used instead of xtext encoding for the user identifier
-use UTF-8 encoding with RFC-4013_ normalisation applied.
+and plain password by replacing *plain* by *plain:b*.
+
+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
@@ -693,10 +698,10 @@ available via PAM (see below).
 
 The PLAIN, LOGIN and CRAM-MD5 mechanisms can use plaintext passwords, stored
 in the secrets file using a password-type of *plain*. In addition, the
-CRAM-MD5 mechanism can also use hashed passwords generated by the
+CRAM-MD5 mechanism can also make use of hashed passwords generated by the
 *emailrelay-passwd* program and these are stored in the secrets file with a
 password-type of *md5*. (Hashed passwords are marginally more secure because
-the plaintext password which might be used on other accounts, is not easily
+the plaintext password which might be used on other accounts is not easily
 recovered. However, hashed passwords can only be used for HMAC authentication
 mechanisms that are based on the same hash function.) The XOAUTH2 mechanism
 can be used for client-side authentication using tokens that have been
@@ -774,10 +779,10 @@ described below.
 
 TLS encryption
 ==============
-E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: to enable
+E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: use the
-client-side TLS encryption when E-MailRelay is acting as an SMTP client use the
+*--client-tls* command-line option to enable client-side TLS encryption when
-*--client-tls* command-line option, and to enable server-side TLS when
+E-MailRelay is acting as an SMTP client, and use *--server-tls* to enable
-E-MailRelay is acting as an SMTP or POP server use *--server-tls*. The
+server-side TLS when E-MailRelay is acting as an SMTP or POP server. The
 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.
@@ -1289,9 +1294,14 @@ simple command-line interface which is compatible with *netcat* and *telnet*:
     E-MailRelay> help
     E-MailRelay> quit
 
-The *flush* command is used to get the E-MailRelay server to forward spooled
+The *forward* command is used to trigger the E-MailRelay server into forwarding
-mail to the next SMTP server. The *forward* command does the same but without
+spooled mail to the next SMTP server.
-waiting for completion.
+
+The *flush* command is similar but it uses its own connection to the SMTP
+server and waits for the messages to be sent.
+
+The *unfail-all* command can be used to remove the *.bad* filename extension
+from files in the spool directory.
 
 The *list* command lists the messages in the spool directory, *status* provides
 network status information and activity statistics, and *notify* enables
@@ -1351,7 +1361,7 @@ Standard (FHS_) use this configure command:
 It is possible to change the installation root directory after building by
 using *make DESTDIR=<root> install* or *DESTDIR=<root> make -e install*.
 However, this will not change the default spool directory path built into the
-scripts and executables so the correct spool directory will have to be
+scripts and executables so the correct spool directory will then have to be
 specified at run-time with the *--spool-dir* command-line option.
 
 On Windows the installation GUI prompts for two installation directories,

doc/reference.txt

@@ -205,8 +205,9 @@ where <option> is:
   suffix only their IPv4 or IPv6 addresses will be used (eg. "ppp0-ipv4").
 
 # --localedir <dir>
-  Specifies a locale base directory where localisation message catalogues  can
+  Enables localisation and specifies the locale base directory where message
-  be found. An empty directory can be used for the built-in default.
+  catalogues can be found. An empty directory can be used for the built-in
+  default.
 
 # --log (-l)
   Enables logging to the standard error stream and to the syslog. The
@@ -357,9 +358,10 @@ where <option> is:
   to set a maximum version.
 
 # --user <username> (-u)
-  When started as root the program switches to an non-privileged effective
+  When started as root the program switches to a non-privileged effective
-  user-id when idle. This option can be used to define which user-id is used.
+  user-id when idle. This option can be used to define the idle user-id and
-  Specify "root" to disable all user-id switching. Ignored on Windows.
+  also the group ownership of new files and sockets. 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
@@ -407,7 +409,7 @@ command-line options:
 * as each message is submitted, just before receipt is acknowledged ("--immediate")
 * as soon as the submitting client connection disconnects ("--forward-on-disconnect")
 * periodically ("--poll=<seconds>")
-* on demand using the administration interface's "flush" command ("--admin=<port>")
+* on demand using the administration interface's "forward" command ("--admin=<port>")
 * when a "--filter" script exits with an exit code of 103
 
 These can be mixed.
@@ -592,13 +594,16 @@ 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
+The "xtext" encoding scheme is defined properly in RFC-3461, but basically it
-defined properly in RFC-3461, but basically it says that non-alphanumeric
+says that non-alphanumeric characters (including space, "+", "#" and "=") should
-characters (including space, "+", "#" and "=") should be represented in
+be represented in uppercase hexadecimal ascii as "+XX". So a space should be
-uppercase hexadecimal ascii as "+XX". So a space should be written as "+20";
+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
+Base64 encoding can be used instead of xtext encoding for the user identifier
-use UTF-8 encoding with RFC-4013 normalisation applied.
+and plain password by replacing "plain" by "plain:b".
+
+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
@@ -610,10 +615,10 @@ available via PAM (see below).
 
 The PLAIN, LOGIN and CRAM-MD5 mechanisms can use plaintext passwords, stored
 in the secrets file using a password-type of "plain". In addition, the
-CRAM-MD5 mechanism can also use hashed passwords generated by the
+CRAM-MD5 mechanism can also make use of hashed passwords generated by the
 "emailrelay-passwd" program and these are stored in the secrets file with a
 password-type of "md5". (Hashed passwords are marginally more secure because
-the plaintext password which might be used on other accounts, is not easily
+the plaintext password which might be used on other accounts is not easily
 recovered. However, hashed passwords can only be used for HMAC authentication
 mechanisms that are based on the same hash function.) The XOAUTH2 mechanism
 can be used for client-side authentication using tokens that have been
@@ -685,10 +690,10 @@ described below.
 
 TLS encryption
 --------------
-E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: to enable
+E-MailRelay can use negotiated TLS to encrypt SMTP and POP sessions: use the
-client-side TLS encryption when E-MailRelay is acting as an SMTP client use the
+"--client-tls" command-line option to enable client-side TLS encryption when
-"--client-tls" command-line option, and to enable server-side TLS when
+E-MailRelay is acting as an SMTP client, and use "--server-tls" to enable
-E-MailRelay is acting as an SMTP or POP server use "--server-tls". The
+server-side TLS when E-MailRelay is acting as an SMTP or POP server. The
 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.
@@ -1135,9 +1140,14 @@ simple command-line interface which is compatible with "netcat" and "telnet":
 	E-MailRelay> help
 	E-MailRelay> quit
 
-The "flush" command is used to get the E-MailRelay server to forward spooled
+The "forward" command is used to trigger the E-MailRelay server into forwarding
-mail to the next SMTP server. The "forward" command does the same but without
+spooled mail to the next SMTP server.
-waiting for completion.
+
+The "flush" command is similar but it uses its own connection to the SMTP
+server and waits for the messages to be sent.
+
+The "unfail-all" command can be used to remove the ".bad" filename extension
+from files in the spool directory.
 
 The "list" command lists the messages in the spool directory, "status" provides
 network status information and activity statistics, and "notify" enables
@@ -1194,7 +1204,7 @@ Standard (FHS) use this configure command:
 It is possible to change the installation root directory after building by
 using "make DESTDIR=<root> install" or "DESTDIR=<root> make -e install".
 However, this will not change the default spool directory path built into the
-scripts and executables so the correct spool directory will have to be
+scripts and executables so the correct spool directory will then have to be
 specified at run-time with the "--spool-dir" command-line option.
 
 On Windows the installation GUI prompts for two installation directories,

doc/windows.html

@@ -20,6 +20,11 @@
      into protected directories like <em>Program Files</em>.
     </p>
 
+    <p>
+     You may need to run <em>vc_redist.x64.exe</em> first to install the Microsoft C++
+     run-time files.
+    </p>
+
     <p>
      The setup GUI will take you through the installation options and then install
      the run-time files into your chosen locations.

doc/windows.md

@@ -9,6 +9,9 @@ setup program `emailrelay-setup.exe` and its associated `payload` files.
 Run `emailrelay-setup.exe` as an administrator if you are going to be installing
 into protected directories like `Program Files`.
 
+You may need to run `vc_redist.x64.exe` first to install the Microsoft C++
+run-time files.
+
 The setup GUI will take you through the installation options and then install
 the run-time files into your chosen locations.
 

doc/windows.rst

@@ -10,6 +10,9 @@ setup program *emailrelay-setup.exe* and its associated *payload* files.
 Run *emailrelay-setup.exe* as an administrator if you are going to be installing
 into protected directories like *Program Files*.
 
+You may need to run *vc_redist.x64.exe* first to install the Microsoft C++
+run-time files.
+
 The setup GUI will take you through the installation options and then install
 the run-time files into your chosen locations.
 

emailrelay.spec

@@ -1,11 +1,11 @@
 Summary: Simple e-mail message transfer agent and proxy using SMTP
 Name: emailrelay
-Version: 2.2.1
+Version: 2.3
 Release: 1
 License: GPL3
 Group: System Environment/Daemons
 URL: http://emailrelay.sourceforge.net
-Source: http://sourceforge.net/projects/emailrelay/files/emailrelay/2.2/emailrelay-2.2.1-src.tar.gz
+Source: http://sourceforge.net/projects/emailrelay/files/emailrelay/2.3/emailrelay-2.3-src.tar.gz
 BuildRoot: /tmp/emailrelay-install
 
 %description

etc/Makefile.am

@@ -63,7 +63,7 @@ install-data-hook:
 	if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else sed -e "s:^#spool-dir .*:spool-dir $(e_spooldir):g" -e 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' -e "s:/etc:$(e_sysconfdir):g" -e "s:/usr/local/bin:$(e_libexecdir):g" < "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi
 	cp "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall"
 
-# remove the .conf file if it has not been editied
+# remove the .conf file if it has not been edited
 uninstall-hook:
 	if diff -q "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall" ; then rm "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi
 	-rm "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall"

etc/Makefile.in

@@ -606,7 +606,7 @@ emailrelay.service: emailrelay.service.in
 @GCONFIG_INSTALL_HOOK_TRUE@	if test -f "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; then : ; else sed -e "s:^#spool-dir .*:spool-dir $(e_spooldir):g" -e 's:"/var/spool/emailrelay":"'"$(e_spooldir)"'":g' -e "s:/etc:$(e_sysconfdir):g" -e "s:/usr/local/bin:$(e_libexecdir):g" < "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.template" > "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi
 @GCONFIG_INSTALL_HOOK_TRUE@	cp "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall"
 
-# remove the .conf file if it has not been editied
+# remove the .conf file if it has not been edited
 @GCONFIG_INSTALL_HOOK_TRUE@uninstall-hook:
 @GCONFIG_INSTALL_HOOK_TRUE@	if diff -q "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall" ; then rm "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf" ; fi
 @GCONFIG_INSTALL_HOOK_TRUE@	-rm "$(DESTDIR)$(e_sysconfdir)/emailrelay.conf.makeinstall"

etc/emailrelay.auth.template

@@ -36,5 +36,8 @@
 # "password" fields should be encoded using the RFC-1891 "xtext" encoding
 # scheme so that they are representing as hexadecimal ascii as "+XX".
 #
+# Alternatively use "plain:b" instead of "plain" and then use Base64 encoding 
+# for the id and password.
+#
 # The "none" rows allow trusted IP addresses to bypass authentication.
 #

etc/emailrelay.conf.template

@@ -277,7 +277,7 @@
 # Name: hidden
 # Format: hidden
 # Description: Windows only. Hides the application window and disables all
-# message boxes, overriding any ""--show"" option. This is useful when
+# message boxes, overriding any "--show" option. This is useful when
 # running as a windows service.
 #
 #hidden
@@ -317,9 +317,9 @@
 
 # Name: localedir
 # Format: localedir <dir>
-# Description: Specifies a locale base directory where localisation message
+# Description: Enables localisation and specifies the locale base directory
-# catalogues  can be found. An empty directory can be used for the built-in
+# where message catalogues can be found. An empty directory can be used for
-# default.
+# the built-in default.
 #
 #localedir /opt/share/locale
 
@@ -568,10 +568,10 @@
 
 # Name: user
 # Format: user <username>
-# Description: When started as root the program switches to an non-privileged
+# Description: When started as root the program switches to a non-privileged
-# effective user-id when idle. This option can be used to define which
+# effective user-id when idle. This option can be used to define the idle
-# user-id is used. Specify "root" to disable all user-id switching. Ignored
+# user-id and also the group ownership of new files and sockets. Specify
-# on Windows.
+# "root" to  disable all user-id switching. Ignored on Windows.
 #
 #user nobody
 

po/POTFILES.in

@@ -138,11 +138,10 @@
 ./src/gnet/glocation.cpp
 ./src/gnet/gtimer.cpp
 ./src/gnet/gtimerlist.cpp
-./src/gnet/gaddress_ipv6.cpp
+./src/gnet/gaddress.cpp
 ./src/gnet/gsocket_unix.cpp
 ./src/gnet/geventloggingcontext.cpp
 ./src/gnet/gconnection.cpp
-./src/gnet/gaddress_ipv4.cpp
 ./src/gnet/gclient.cpp
 ./src/gnet/gexceptionhandler.cpp
 ./src/gnet/gexceptionsource.cpp

src/.clang-tidy

@@ -5,6 +5,8 @@
 #
 Checks: "\
 bugprone-*,\
+-bugprone-easily-swappable-parameters,\
+-bugprone-throw-keyword-missing,\
 -bugprone-macro-parentheses,\
 -bugprone-branch-clone,\
 cert-*,\
@@ -20,7 +22,9 @@ cppcoreguidelines-pro-type-member-init,\
 -cppcoreguidelines-avoid-magic-numbers,\
 -cppcoreguidelines-macro-usage,\
 -cppcoreguidelines-avoid-non-const-global-variables,\
+-cppcoreguidelines-prefer-member-initializer,\
 modernize-*,\
+-modernize-avoid-bind,\
 -modernize-use-auto,\
 -modernize-use-default-member-init,\
 -modernize-return-braced-init-list,\
@@ -28,7 +32,9 @@ modernize-*,\
 -modernize-raw-string-literal,\
 -modernize-use-trailing-return-type,\
 performance-*,\
+-performance-unnecessary-value-param,\
 readability-*,\
+-readability-function-cognitive-complexity,\
 -readability-qualified-auto,\
 -readability-simplify-boolean-expr,\
 -readability-else-after-return,\

src/gauth/gcram.cpp

@@ -39,7 +39,7 @@ namespace GAuth
 		GSsl::Library & lib()
 		{
 			GSsl::Library * p = GSsl::Library::instance() ;
-			if( p == nullptr ) throw std::runtime_error( "no tsl library" ) ;
+			if( p == nullptr ) throw G::Exception( "no tls library" ) ;
 			return *p ;
 		}
 		struct DigesterAdaptor /// Used by GAuth::Cram to use GSsl::Digester.

src/gauth/gsaslclient.cpp

@@ -112,15 +112,15 @@ std::string GAuth::SaslClientImp::mechanism( const G::StringArray & server_mecha
 		our_list.push_back( LOGIN ) ;
 	}
 
-	// use the configuration string as a mechanism whitelist and/or blacklist
+	// use the configuration string as a mechanism whitelist and/or blocklist
 	if( !m_config.empty() )
 	{
 		bool simple = G::Str::imatch( our_list , m_config ) ; // eg. allow "plain" as well as "m:plain"
 		G::StringArray list = G::Str::splitIntoTokens( G::Str::upper(m_config) , ";" ) ;
 		G::StringArray whitelist = G::Str::splitIntoTokens( simple?G::Str::upper(m_config): G::Str::headMatchResidue( list , "M:" ) , "," ) ;
-		G::StringArray blacklist = G::Str::splitIntoTokens( G::Str::headMatchResidue( list , "X:" ) , "," ) ;
+		G::StringArray blocklist = G::Str::splitIntoTokens( G::Str::headMatchResidue( list , "X:" ) , "," ) ;
 		our_list.erase( G::Str::keepMatch( our_list.begin() , our_list.end() , whitelist , true ) , our_list.end() ) ;
-		our_list.erase( G::Str::removeMatch( our_list.begin() , our_list.end() , blacklist , true ) , our_list.end() ) ;
+		our_list.erase( G::Str::removeMatch( our_list.begin() , our_list.end() , blocklist , true ) , our_list.end() ) ;
 	}
 
 	// build the list of mechanisms that we can use with the server

src/gauth/gsaslclient.h

@@ -25,6 +25,7 @@
 #include "gsaslclientsecrets.h"
 #include "gexception.h"
 #include "gstrings.h"
+#include <memory>
 
 namespace GAuth
 {
@@ -73,8 +74,8 @@ public:
 		///< Returns the empty string if none is supported or if not active().
 
 	bool next() ;
-		///< Moves to the next preferred mechanism. Returns the empty
+		///< Moves to the next preferred mechanism. Returns false if there
-		///< string if there are no more mechanisms.
+		///< are no more mechanisms.
 
 	std::string next( const std::string & ) ;
 		///< A convenience overload that moves to the next() mechanism

src/gauth/gsaslclientsecrets.h

@@ -33,13 +33,14 @@ namespace GAuth
 //| \class GAuth::SaslClientSecrets
 /// An interface used by GAuth::SaslClient to obtain a client id and
 /// its authentication secret. Conceptually there is one client and
-/// they can have a secrets encoded in multiple ways.
+/// they can have secrets encoded in multiple ways.
 ///
 class GAuth::SaslClientSecrets : public virtual Valid
 {
 public:
-	virtual Secret clientSecret( const std::string & encoding_type ) const = 0 ;
+	virtual Secret clientSecret( const std::string & type ) const = 0 ;
-		///< Returns the client secret for the given encoding type.
+		///< Returns the client secret for the given type.
+		///< The type is "plain" or the CRAM hash algorithm or "oauth".
 		///< Returns an invalid secret if none.
 } ;
 

src/gauth/gsaslserverpam.cpp

@@ -45,9 +45,11 @@ public:
 	std::string id() const ;
 	bool authenticated() const ;
 
-private:
+public:
-	SaslServerPamImp( const SaslServerPamImp & ) ;
+	SaslServerPamImp( const SaslServerPamImp & ) = delete ;
-	void operator=( const SaslServerPamImp & ) ;
+	SaslServerPamImp( SaslServerPamImp && ) = delete ;
+	void operator=( const SaslServerPamImp & ) = delete ;
+	void operator=( SaslServerPamImp && ) = delete ;
 
 private:
 	bool m_active ;
@@ -76,9 +78,11 @@ protected:
 	void converse( ItemArray & ) override ;
 	void delay( unsigned int usec ) override ;
 
-private:
+public:
-	PamImp( const PamImp & ) ;
+	PamImp( const PamImp & ) = delete ;
-	void operator=( const PamImp & ) ;
+	PamImp( PamImp && ) = delete ;
+	void operator=( const PamImp & ) = delete ;
+	void operator=( PamImp && ) = delete ;
 
 private:
 	std::string m_app ;
@@ -159,7 +163,7 @@ bool GAuth::SaslServerPamImp::init( const std::string & mechanism )
 
 std::string GAuth::SaslServerPamImp::id() const
 {
-	return m_pam.get() ? m_pam->id() : std::string() ;
+	return m_pam ? m_pam->id() : std::string() ;
 }
 
 std::string GAuth::SaslServerPamImp::apply( const std::string & response , bool & done )

src/gauth/gsaslserverpam.h

@@ -53,11 +53,11 @@ public:
 		///< Constructor.
 
 public:
-	~SaslServerPam() ;
+	~SaslServerPam() override ;
 	SaslServerPam( const SaslServerPam & ) = delete ;
 	SaslServerPam( SaslServerPam && ) = delete ;
-	void operator=( const SaslServerPam & ) = delete ;
+	SaslServerPam & operator=( const SaslServerPam & ) = delete ;
-	void operator=( SaslServerPam && ) = delete ;
+	SaslServerPam & operator=( SaslServerPam && ) = delete ;
 
 private: // overrides
 	bool requiresEncryption() const override ; // Override from GAuth::SaslServer.

src/gauth/gsaslserversecrets.h

@@ -39,8 +39,9 @@ namespace GAuth
 class GAuth::SaslServerSecrets : public virtual Valid
 {
 public:
-	virtual Secret serverSecret( const std::string & encoding_type , const std::string & id ) const = 0 ;
+	virtual Secret serverSecret( const std::string & type , const std::string & id ) const = 0 ;
 		///< Returns the server secret for the given client id.
+		///< The type is "plain" or the CRAM hash algorithm.
 		///< Returns an invalid secret if not found.
 
 	virtual std::pair<std::string,std::string> serverTrust( const std::string & address_range ) const = 0 ;

src/gauth/gsecret.cpp

@@ -150,7 +150,8 @@ bool GAuth::Secret::isDotted( const std::string & s )
 
 std::string GAuth::Secret::undotted( const std::string & s )
 {
-	G::StringArray decimals = G::Str::splitIntoFields( s , "." ) ; decimals.resize( 8U ) ;
+	G::StringArray decimals = G::Str::splitIntoFields( s , "." ) ;
+	decimals.resize( 8U ) ;
 	std::string result ;
 	for( std::size_t i = 0U ; i < 8U ; i++ )
 	{

src/gauth/gsecrets.cpp

@@ -37,18 +37,18 @@ void GAuth::Secrets::check( const std::string & p1 , const std::string & p2 , co
 	std::for_each( list.begin() , list.end() , &SecretsFile::check ) ;
 }
 
-GAuth::Secrets::Secrets( const std::string & path , const std::string & name , const std::string & type ) :
+GAuth::Secrets::Secrets( const std::string & path , const std::string & name ) :
 	m_source(path)
 {
 	G_DEBUG( "GAuth::Secrets:ctor: [" << path << "]" ) ;
 	if( m_source != "/pam" )
-		m_imp = std::make_unique<SecretsFile>( path , true , name , type ) ;
+		m_imp = std::make_unique<SecretsFile>( path , true , name ) ;
 }
 
 GAuth::Secrets::Secrets()
 {
 	if( m_source != "/pam" )
-		m_imp = std::make_unique<SecretsFile>( std::string() , true , std::string() , std::string() ) ;
+		m_imp = std::make_unique<SecretsFile>( std::string() , false , std::string() ) ;
 }
 
 GAuth::Secrets::~Secrets()
@@ -64,14 +64,14 @@ bool GAuth::Secrets::valid() const
 	return m_source == "/pam" || m_imp->valid() ;
 }
 
-GAuth::Secret GAuth::Secrets::clientSecret( const std::string & mechanism ) const
+GAuth::Secret GAuth::Secrets::clientSecret( const std::string & type ) const
 {
-	return valid() ? m_imp->clientSecret(mechanism) : Secret::none() ;
+	return valid() ? m_imp->clientSecret(type) : Secret::none() ;
 }
 
-GAuth::Secret GAuth::Secrets::serverSecret( const std::string & mechanism , const std::string & id ) const
+GAuth::Secret GAuth::Secrets::serverSecret( const std::string & type , const std::string & id ) const
 {
-	return valid() ? m_imp->serverSecret( mechanism , id ) : Secret::none() ;
+	return valid() ? m_imp->serverSecret( type , id ) : Secret::none() ;
 }
 
 std::pair<std::string,std::string> GAuth::Secrets::serverTrust( const std::string & address_range ) const
@@ -79,8 +79,8 @@ std::pair<std::string,std::string> GAuth::Secrets::serverTrust( const std::strin
 	return valid() ? m_imp->serverTrust( address_range ) : std::make_pair(std::string(),std::string()) ;
 }
 
-bool GAuth::Secrets::contains( const std::string & mechanism ) const
+bool GAuth::Secrets::contains( const std::string & type ) const
 {
-	return valid() ? m_imp->contains( mechanism ) : false ;
+	return valid() ? m_imp->contains( type ) : false ;
 }
 

src/gauth/gsecrets.h

@@ -46,19 +46,13 @@ public:
 		///< Checks the given secret sources. Logs warnings and throws
 		///< an exception if there are any fatal errors.
 
-	Secrets( const std::string & source_storage_path , const std::string & debug_name ,
+	Secrets( const std::string & source_storage_path , const std::string & debug_name ) ;
-		const std::string & server_type = std::string() ) ;
 		///< Constructor. The connection string is a secrets file path
 		///< or "/pam".
 		///<
 		///< The 'debug-name' is used in log and error messages to
 		///< identify the repository.
 		///<
-			///< The 'server-type' parameter can be used to select
-			///< a different set of server-side authentication records
-			///< that may be stored in the same repository such as
-			///< "smtp" or "pop". The default is "server".
-			///<
 		///< Throws on error, although an empty path is not
 		///< considered an error: see valid().
 
@@ -68,10 +62,10 @@ public:
 	bool valid() const override ;
 		///< Override from GAuth::Valid virtual base.
 
-	Secret serverSecret( const std::string & mechanism , const std::string & id ) const override ;
+	Secret serverSecret( const std::string & type , const std::string & id ) const override ;
 		///< Override from GAuth::SaslServerSecrets.
 
-	bool contains( const std::string & mechanism ) const override ;
+	bool contains( const std::string & type ) const override ;
 		///< Override from GAuth::SaslServerSecrets.
 
 public:
@@ -83,7 +77,7 @@ public:
 
 private: // overrides
 	std::string source() const override ; // Override from GAuth::SaslServerSecrets.
-	Secret clientSecret( const std::string & mechanism ) const override ; // Override from GAuth::SaslClientSecrets.
+	Secret clientSecret( const std::string & type ) const override ; // Override from GAuth::SaslClientSecrets.
 	std::pair<std::string,std::string> serverTrust( const std::string & address_range ) const override ; // Override from GAuth::SaslServerSecrets.
 
 private:

src/gauth/gsecretsfile.cpp

@@ -23,6 +23,7 @@
 #include "gsecrets.h"
 #include "groot.h"
 #include "gxtext.h"
+#include "gbase64.h"
 #include "gstr.h"
 #include "gdatetime.h"
 #include "gfile.h"
@@ -35,31 +36,23 @@
 #include <utility> // std::swap(), std::pair
 #include <sstream>
 
-GAuth::SecretsFile::SecretsFile( const G::Path & path , bool auto_reread , const std::string & debug_name ,
+GAuth::SecretsFile::SecretsFile( const G::Path & path , bool auto_reread , const std::string & debug_name ) :
-	const std::string & server_type ) :
 	m_path(path) ,
 	m_auto(auto_reread) ,
 	m_debug_name(debug_name) ,
-		m_server_type(G::Str::lower(server_type)) ,
 	m_file_time(0) ,
 	m_check_time(G::SystemTime::now())
 {
-	m_server_type = m_server_type.empty() ? std::string("server") : m_server_type ;
 	m_valid = ! path.str().empty() ;
 	if( m_valid )
-		read( path , false ) ;
+		read( path ) ;
 }
 
 void GAuth::SecretsFile::check( const std::string & path )
-{
-	checkImp( path , true , "server" ) ; // allow only 'client' or 'server' lines
-}
-
-void GAuth::SecretsFile::checkImp( const std::string & path , bool strict_side , const std::string & server_type )
 {
 	if( !path.empty() )
 	{
-		Contents contents = readContents( path , server_type , strict_side ) ;
+		Contents contents = readContents( path ) ;
 		showWarnings( contents.m_warnings , path ) ;
 		if( !contents.m_warnings.empty() )
 			throw Error() ;
@@ -90,16 +83,16 @@ void GAuth::SecretsFile::reread( int )
 			if( t != m_file_time )
 			{
 				G_LOG_S( "GAuth::Secrets: re-reading secrets file: " << m_path ) ;
-				read( m_path , false ) ;
+				read( m_path ) ;
 			}
 		}
 	}
 }
 
-void GAuth::SecretsFile::read( const G::Path & path , bool strict_side )
+void GAuth::SecretsFile::read( const G::Path & path )
 {
 	m_file_time = readFileTime( path ) ;
-	m_contents = readContents( path , m_server_type , strict_side ) ;
+	m_contents = readContents( path ) ;
 	showWarnings( m_contents.m_warnings , path , m_debug_name ) ;
 }
 
@@ -109,7 +102,7 @@ G::SystemTime GAuth::SecretsFile::readFileTime( const G::Path & path )
 	return G::File::time( path ) ;
 }
 
-GAuth::SecretsFile::Contents GAuth::SecretsFile::readContents( const G::Path & path , const std::string & server_type , bool strict_side )
+GAuth::SecretsFile::Contents GAuth::SecretsFile::readContents( const G::Path & path )
 {
 	std::unique_ptr<std::ifstream> file ;
 	{
@@ -121,10 +114,10 @@ GAuth::SecretsFile::Contents GAuth::SecretsFile::readContents( const G::Path & p
 		throw Secrets::OpenError( path.str() ) ;
 	}
 
-	return readContents( *file , server_type , strict_side ) ;
+	return readContents( *file ) ;
 }
 
-GAuth::SecretsFile::Contents GAuth::SecretsFile::readContents( std::istream & file , const std::string & server_type , bool strict_side )
+GAuth::SecretsFile::Contents GAuth::SecretsFile::readContents( std::istream & file )
 {
 	Contents contents ;
 	for( unsigned int line_number = 1U ; file.good() ; ++line_number )
@@ -141,61 +134,80 @@ GAuth::SecretsFile::Contents GAuth::SecretsFile::readContents( std::istream & fi
 			if( word_array.size() >= 4U )
 			{
 				// 0=<client-server> 1=<encoding-type> 2=<userid-or-ipaddress> 3=<secret-or-verifier-hint>
-				processLine( contents , server_type , line_number , word_array[0U] , word_array[1U] , word_array[2U] , word_array[3U] , strict_side ) ;
+				processLine( contents , line_number , word_array[0U] , word_array[1U] , word_array[2U] , word_array[3U] ) ;
 			}
 			else
 			{
-				addWarning( contents , line_number , "too few fields" , "" ) ;
+				addWarning( contents , line_number , "too few fields" ) ;
 			}
 		}
 	}
 	return contents ;
 }
 
-void GAuth::SecretsFile::processLine( Contents & contents , const std::string & server_type ,
+void GAuth::SecretsFile::processLine( Contents & contents ,
-	unsigned int line_number , const std::string & side_in , const std::string & encoding_type_in ,
+	unsigned int line_number , const std::string & side , const std::string & type_in ,
-	const std::string & id_xtext_or_ip , const std::string & secret , bool strict_side )
+	const std::string & id_or_ip_in , const std::string & secret_in )
 {
-	G_ASSERT( !side_in.empty() && !encoding_type_in.empty() && !id_xtext_or_ip.empty() && !secret.empty() ) ;
+	std::string type = G::Str::lower( type_in ) ;
-	std::string encoding_type = G::Str::lower( encoding_type_in ) ;
+	std::string id_or_ip = id_or_ip_in ;
-	std::string side = G::Str::lower( side_in ) ;
+	std::string secret = secret_in ;
-
+	if( type == "plain:b" )
-	if( !G::Xtext::valid(id_xtext_or_ip) ) // (ip address ranges are valid xtext)
-		addWarning( contents , line_number , "invalid xtext encoding in third field" , id_xtext_or_ip ) ;
-
-	if( encoding_type == "client" || encoding_type == "server" || encoding_type == server_type ) // old-style field order, eg. "cram-md5 server ..."
 	{
-		const bool plain = side == "plain" || side == "login" ;
+		// for now just re-encode to xtext -- TODO rework secrets-file encodings
-		addWarning( contents , line_number , "incorrect field order: use \"" + encoding_type + " " + (plain?"plain":"md5") + " <id> <" + (plain?"pwd":"hash") + ">\"" , "" ) ;
+        bool valid_id = G::Base64::valid( id_or_ip ) ;
+		bool valid_secret = G::Base64::valid( secret ) ;
+		if( !valid_id )
+            addWarning( contents , line_number , "invalid base64 encoding in third field" , id_or_ip ) ;
+        if( !valid_secret )
+            addWarning( contents , line_number , "invalid base64 encoding in fourth field" ) ;
+		if( !valid_id || !valid_secret )
+			return ;
+		type = "plain" ;
+        id_or_ip = G::Xtext::encode( G::Base64::decode(id_or_ip) ) ;
+        secret = G::Xtext::encode( G::Base64::decode(secret) ) ;
 	}
-	else if( side == server_type )
+	processLineImp( contents , line_number , G::Str::lower(side) , type , id_or_ip , secret ) ;
+}
+
+void GAuth::SecretsFile::processLineImp( Contents & contents ,
+	unsigned int line_number , const std::string & side , const std::string & type ,
+	const std::string & id_or_ip , const std::string & secret )
+{
+	G_ASSERT( !side.empty() && !type.empty() && !id_or_ip.empty() && !secret.empty() ) ;
+
+	if( type == "plain" )
+	{
+		if( !G::Xtext::valid(id_or_ip) ) // (ip address ranges are valid xtext)
+			addWarning( contents , line_number , "invalid xtext encoding in third field" , id_or_ip ) ;
+		if( !G::Xtext::valid(secret) )
+			addWarning( contents , line_number , "invalid xtext encoding in fourth field" ) ; // (new)
+	}
+
+	if( side == "server" )
 	{
 		// server-side
-		std::string key = serverKey( encoding_type , id_xtext_or_ip ) ;
+		std::string key = serverKey( type , id_or_ip ) ;
 		Value value( secret , line_number ) ;
 		bool inserted = contents.m_map.insert(std::make_pair(key,value)).second ;
 		if( inserted )
-			contents.m_types.insert( canonical(encoding_type) ) ;
+			contents.m_types.insert( canonical(type) ) ;
 		else
 			addWarning( contents , line_number , "duplicate server secret" , key ) ;
 	}
 	else if( side == "client" )
 	{
 		// client-side
-		const std::string & id = id_xtext_or_ip ;
+		const std::string & id = id_or_ip ;
-		std::string key = clientKey( encoding_type ) ; // not including user id
+		std::string key = clientKey( type ) ; // not including user id
 		Value value( id + " " + secret , line_number ) ;
 		bool inserted = contents.m_map.insert(std::make_pair(key,value)).second ;
 		if( !inserted )
 			addWarning( contents , line_number , "too many client secrets" , key ) ;
 	}
-	else if( strict_side )
-	{
-		addWarning( contents , line_number , "invalid value in first field: expecting 'client' or '" + server_type + "'" , side ) ;
-	}
 	else
 	{
-		G_DEBUG( "GAuth::SecretsFile::processLine: ignoring line number " << line_number << ": not 'client' or '" << server_type << "'" ) ;
+		addWarning( contents , line_number , "invalid value in first field" , side ) ;
 	}
 }
 
@@ -218,38 +230,40 @@ void GAuth::SecretsFile::showWarnings( const Warnings & warnings , const G::Path
 	}
 }
 
-std::string GAuth::SecretsFile::canonical( const std::string & encoding_type )
+std::string GAuth::SecretsFile::canonical( const std::string & type_in )
 {
-	std::string type = G::Str::lower( encoding_type ) ;
+	// (cram-md5, apop and login are for backwards compatibility -- new
+	// code exects plain, md5, sha1, sha512 etc)
+	std::string type = G::Str::lower( type_in ) ;
 	if( type == "cram-md5" ) type = "md5" ;
 	if( type == "apop" ) type = "md5" ;
 	if( type == "login" ) type = "plain" ;
 	return type ;
 }
 
-std::string GAuth::SecretsFile::serverKey( const std::string & encoding_type , const std::string & id_xtext )
+std::string GAuth::SecretsFile::serverKey( const std::string & type , const std::string & id_xtext )
 {
 	// eg. key -> value...
 	// "server plain bob" -> "e+3Dmc2"
 	// "server md5 bob" -> "xbase64x=="
 	// "server none 192.168.0.0/24" -> "trustee"
 	// "server none ::1/128" -> "trustee"
-	return "server " + canonical(encoding_type) + " " + id_xtext ;
+	return "server " + canonical(type) + " " + id_xtext ;
 }
 
-std::string GAuth::SecretsFile::clientKey( const std::string & encoding_type )
+std::string GAuth::SecretsFile::clientKey( const std::string & type )
 {
 	// eg. key -> value...
 	// "client plain" -> "alice secret+21"
 	// "client md5" -> "alice xbase64x=="
-	return "client " + canonical(encoding_type) ;
+	return "client " + canonical(type) ;
 }
 
-GAuth::Secret GAuth::SecretsFile::clientSecret( const std::string & encoding_type ) const
+GAuth::Secret GAuth::SecretsFile::clientSecret( const std::string & type ) const
 {
 	reread() ;
 
-	auto p = m_contents.m_map.find( clientKey(encoding_type) ) ;
+	auto p = m_contents.m_map.find( clientKey(type) ) ;
 	if( p == m_contents.m_map.end() )
 	{
 		return Secret::none() ;
@@ -258,25 +272,25 @@ GAuth::Secret GAuth::SecretsFile::clientSecret( const std::string & encoding_typ
 	{
 		std::string id_xtext = G::Str::head( (*p).second.s , " " ) ;
 		std::string secret_encoded = G::Str::tail( (*p).second.s , " " ) ;
-		return Secret( secret_encoded , canonical(encoding_type) , id_xtext , true , line((*p).second.n) ) ;
+		return Secret( secret_encoded , canonical(type) , id_xtext , true , line((*p).second.n) ) ;
 	}
 }
 
-GAuth::Secret GAuth::SecretsFile::serverSecret( const std::string & encoding_type , const std::string & id ) const
+GAuth::Secret GAuth::SecretsFile::serverSecret( const std::string & type , const std::string & id ) const
 {
 	if( id.empty() )
 		return Secret::none() ;
 
 	reread() ;
 
-	auto p = m_contents.m_map.find( serverKey(encoding_type,G::Xtext::encode(id)) ) ;
+	auto p = m_contents.m_map.find( serverKey(type,G::Xtext::encode(id)) ) ;
 	if( p == m_contents.m_map.end() )
 	{
 		return Secret::none( id ) ;
 	}
 	else
 	{
-		return Secret( (*p).second.s , canonical(encoding_type) , id , false , line((*p).second.n) ) ;
+		return Secret( (*p).second.s , canonical(type) , id , false , line((*p).second.n) ) ;
 	}
 }
 
@@ -285,9 +299,9 @@ std::pair<std::string,std::string> GAuth::SecretsFile::serverTrust( const std::s
 	reread() ; // (new)
 
 	std::pair<std::string,std::string> result ;
-	std::string encoding_type = "none" ;
+	std::string type = "none" ;
 	const std::string & id = address_range ; // the address-range lives in the id field
-	auto p = m_contents.m_map.find( serverKey(encoding_type,G::Xtext::encode(id)) ) ;
+	auto p = m_contents.m_map.find( serverKey(type,G::Xtext::encode(id)) ) ;
 	if( p != m_contents.m_map.end() )
 	{
 		result.first = (*p).second.s ; // the trustee name lives in the shared-secret field
@@ -301,9 +315,11 @@ std::string GAuth::SecretsFile::path() const
 	return m_path.str() ;
 }
 
-bool GAuth::SecretsFile::contains( const std::string & encoding_type ) const
+bool GAuth::SecretsFile::contains( const std::string & type , const std::string & id ) const
 {
-	return m_contents.m_types.find(canonical(encoding_type)) != m_contents.m_types.end() ;
+	return id.empty() ?
+		m_contents.m_types.find( canonical(type) ) != m_contents.m_types.end() :
+		m_contents.m_map.find( serverKey(type,G::Xtext::encode(id)) ) != m_contents.m_map.end() ;
 }
 
 std::string GAuth::SecretsFile::line( unsigned int line_number )

src/gauth/gsecretsfile.h

@@ -51,21 +51,19 @@ public:
 		///< Checks the given file. Logs warnings and throws an exception
 		///< if there are any fatal errors.
 
-	SecretsFile( const G::Path & path , bool auto_reread , const std::string & debug_name ,
+	SecretsFile( const G::Path & path , bool auto_reread , const std::string & debug_name ) ;
-		const std::string & server_type = std::string() ) ;
+		///< Constructor to read "client" and "server" records from
-			///< Constructor to read "client" and "<server-type>" records
+		///< the named file. The path is optional; see valid().
-			///< from the named file. The server type defaults to "server".
-			///< The filename path is optional; see valid().
 
 	bool valid() const ;
 		///< Returns true if the file path was supplied in the ctor.
 
-	Secret clientSecret( const std::string & encoding_type ) const ;
+	Secret clientSecret( const std::string & type ) const ;
-		///< Returns the client id and secret for the given encoding-type.
+		///< Returns the client id and secret for the given type.
 		///< Returns the empty string if none.
 
-	Secret serverSecret( const std::string & encoding_type , const std::string & id ) const ;
+	Secret serverSecret( const std::string & type , const std::string & id ) const ;
-		///< Returns the server secret for the given id and encoding-type.
+		///< Returns the server secret for the given id and type.
 		///< Returns the empty string if none.
 
 	std::pair<std::string,std::string> serverTrust( const std::string & address_range ) const ;
@@ -75,8 +73,9 @@ public:
 	std::string path() const ;
 		///< Returns the file path, as supplied to the ctor.
 
-	bool contains( const std::string & server_encoding_type ) const ;
+	bool contains( const std::string & type , const std::string & id = {} ) const ;
-		///< Returns true if the given server encoding-type is represented.
+		///< Returns true if a server secret of the given type
+		///< is available for the particular user or any user.
 
 private:
 	struct Value
@@ -97,16 +96,17 @@ private:
 	} ;
 
 private:
-	void read( const G::Path & , bool ) ;
+	void read( const G::Path & ) ;
 	void reread() const ;
 	void reread( int ) ;
-	static void checkImp( const std::string & path , bool strict , const std::string & server_type ) ;
+	static Contents readContents( const G::Path & ) ;
-	static Contents readContents( const G::Path & , const std::string & , bool ) ;
+	static Contents readContents( std::istream & ) ;
-	static Contents readContents( std::istream & , const std::string & , bool ) ;
+	static void processLine( Contents & ,
-	static void processLine( Contents & , const std::string & server_type ,
+		unsigned int , const std::string & side , const std::string & , const std::string & , const std::string & ) ;
-		unsigned int , const std::string & side , const std::string & , const std::string & , const std::string & , bool ) ;
+	static void processLineImp( Contents & ,
-	static void showWarnings( const Warnings & warnings , const G::Path & path , const std::string & debug_name = std::string() ) ;
+		unsigned int , const std::string & side , const std::string & , const std::string & , const std::string & ) ;
-	static void addWarning( Contents & , unsigned int , const std::string & , const std::string & ) ;
+	static void showWarnings( const Warnings & warnings , const G::Path & path , const std::string & debug_name = {} ) ;
+	static void addWarning( Contents & , unsigned int , const std::string & , const std::string & = {} ) ;
 	static std::string canonical( const std::string & encoding_type ) ;
 	static std::string serverKey( const std::string & , const std::string & ) ;
 	static std::string clientKey( const std::string & ) ;
@@ -117,7 +117,6 @@ private:
 	G::Path m_path ;
 	bool m_auto ;
 	std::string m_debug_name ;
-	std::string m_server_type ;
 	bool m_valid ;
 	Contents m_contents ;
 	G::SystemTime m_file_time ;

src/gconfig_defs.h.in

@@ -3,9 +3,6 @@
 /* Define true to use epoll */
 #undef GCONFIG_ENABLE_EPOLL
 
-/* Define true to use IPv6 */
-#undef GCONFIG_ENABLE_IPV6
-
 /* Define true to use std::thread */
 #undef GCONFIG_ENABLE_STD_THREAD
 

src/glib/garg.cpp

@@ -121,7 +121,7 @@ std::size_t G::Arg::match( const std::string & prefix ) const
 {
 	for( std::size_t i = 1U ; i < m_array.size() ; i++ )
 	{
-		if( G::Str::headMatch(m_array[i],prefix) )
+		if( Str::headMatch(m_array[i],prefix) )
 		{
 			return i ;
 		}
@@ -205,8 +205,8 @@ void G::Arg::parseImp( const std::string & command_line )
 	string_view nbws( "\0\0" , 2U ) ;
 	const char esc = '\\' ;
 	const char qq = '\"' ;
-	G::Str::splitIntoTokens( G::Str::dequote(command_line,qq,esc,ws,nbws) , m_array , ws , esc ) ;
+	Str::splitIntoTokens( Str::dequote(command_line,qq,esc,ws,nbws) , m_array , ws , esc ) ;
-	G::Str::replace( m_array , '\0' , ' ' ) ;
+	Str::replace( m_array , '\0' , ' ' ) ;
 }
 
 std::string G::Arg::exe( bool do_throw )

src/glib/gbase64.cpp

@@ -112,7 +112,7 @@ void G::Base64Imp::encode_imp( iterator_out result_p , string_in input , string_
 	auto const end = input.end() ;
 	for( auto p = input.begin() ; p != end ; blocks++ )
 	{
-		if( !eol.empty() && blocks && (blocks % blocks_per_line) == 0U )
+		if( !eol.empty() && blocks != 0U && (blocks % blocks_per_line) == 0U )
 			std::copy( eol.begin() , eol.end() , result_p ) ;
 
 		uint32_type n = 0UL ;
@@ -252,7 +252,7 @@ void G::Base64Imp::generate_8( g_uint32_t & n , std::size_t & bits , iterator_ou
 		*result++ = to_char(hi_8(n)) ;
 		n <<= 8U ;
 	}
-	else if( hi_8(n) )
+	else if( hi_8(n) != 0U )
 	{
 		error = true ;
 	}
@@ -261,7 +261,7 @@ void G::Base64Imp::generate_8( g_uint32_t & n , std::size_t & bits , iterator_ou
 std::size_t G::Base64Imp::index( char c , bool & error ) noexcept
 {
 	std::size_t pos = character_map.find( c ) ;
-	error = error || !c || pos == std::string::npos ;
+	error = error || (c=='\0') || pos == std::string::npos ;
 	return pos == std::string::npos ? std::size_t(0) : pos ;
 }
 

src/glib/gbatchfile.h

@@ -44,10 +44,10 @@ class G::BatchFile
 public:
 	G_EXCEPTION( Error , "batch file error" ) ;
 
-	explicit BatchFile( const G::Path & ) ;
+	explicit BatchFile( const Path & ) ;
 		///< Constructor that reads from a file.
 
-	BatchFile( const G::Path & , std::nothrow_t ) ;
+	BatchFile( const Path & , std::nothrow_t ) ;
 		///< Constructor that reads from a file that might be missing
 		///< or empty.
 
@@ -61,14 +61,14 @@ public:
 	std::string name() const ;
 		///< Returns the "start" window name, if any.
 
-	const G::StringArray & args() const ;
+	const StringArray & args() const ;
 		///< Returns the startup command-line broken up into de-quoted pieces.
 		///< The first item in the list will be the executable.
 
 	std::size_t lineArgsPos() const ;
 		///< Returns the position in line() where the arguments start.
 
-	static void write( const G::Path & , const StringArray & args ,
+	static void write( const Path & , const StringArray & args ,
 		const std::string & start_window_name = std::string() ) ;
 			///< Writes a startup batch file, including a "start" prefix.
 			///< If the "start" window name is not supplied then it is
@@ -87,7 +87,7 @@ private:
 private:
 	std::string m_line ;
 	std::string m_name ;
-	G::StringArray m_args ;
+	StringArray m_args ;
 } ;
 
 #endif

src/glib/gbuffer.h

@@ -87,10 +87,14 @@ namespace G
 		const T & at( std::size_t i ) const { checkindex( i ) ; return *(m_p+i) ; }
 		T & at( std::size_t i ) { checkindex( i ) ; return *(m_p+i) ; }
 		std::size_t size() const noexcept { return m_n ; }
+		std::size_t capacity() const noexcept { return m_c ; }
 		bool empty() const noexcept { return m_n == 0U ; }
 		void clear() noexcept { m_n = 0 ; }
+		void shrink_to_fit() noexcept { if( empty() && m_p ) { std::free(m_p) ; m_p = nullptr ; m_c = 0U ; } } // NOLINT cppcoreguidelines-no-malloc
 		iterator begin() noexcept { return m_p ? m_p : &m_c0 ; }
 		iterator end() noexcept { return m_p ? (m_p+m_n) : &m_c0 ; }
+		const value_type * data() const noexcept { return m_p ? m_p : &m_c0 ; }
+		value_type * data() noexcept { return m_p ? m_p : &m_c0 ; }
 		const_iterator begin() const noexcept { return m_p ? m_p : &m_c0 ; }
 		const_iterator end() const noexcept { return m_p ? (m_p+m_n) : &m_c0 ; }
 		const_iterator cbegin() const noexcept { return m_p ? m_p : &m_c0 ; }
@@ -182,7 +186,7 @@ namespace G
 		char * m_p{nullptr} ;
 		std::size_t m_n{0U} ;
 		std::size_t m_c{0U} ;
-		char m_c0{'\0'} ;
+		value_type m_c0{'\0'} ;
 	} ;
 
 	template <typename Uptr, typename T = char>
@@ -193,7 +197,7 @@ namespace G
 		G_ASSERT( p == nullptr || p == &buffer[0] ) ; // assert malloc is behaving
 		if( p != &buffer[0] )
 			throw std::bad_cast() ; // buffer too small for a U
-		return new(p) U ; // placement new
+		return new(p) U ;
 	}
 
 	template <typename Uptr, typename T = char>
@@ -204,7 +208,7 @@ namespace G
 		G_ASSERT( p == nullptr || p == &buffer[0] ) ; // assert malloc is behaving
 		if( p != &buffer[0] )
 			return nullptr ; // buffer too small for a U
-		return new(p) U ; // placement new
+		return new(p) U ;
 	}
 
 	template <typename Uptr, typename T = char>
@@ -214,7 +218,7 @@ namespace G
 		return const_cast<Uptr>( buffer_cast<U*>( const_cast<Buffer<T>&>(buffer) ) ) ;
 	}
 
-	template <typename T> void swap( Buffer<T> & a , Buffer<T> & b )
+	template <typename T> void swap( Buffer<T> & a , Buffer<T> & b ) noexcept
 	{
 		a.swap( b ) ;
 	}

src/glib/gcleanup_unix.cpp

@@ -186,9 +186,9 @@ void G::CleanupImp::installHandler( int signum )
 bool G::CleanupImp::ignored( int signum )
 {
 	struct ::sigaction action {} ;
-	if( ::sigaction( signum , nullptr , &action ) )
+	if( ::sigaction( signum , nullptr , &action ) != 0 )
 		throw Cleanup::Error( "sigaction" ) ;
-	return action.sa_handler == SIG_IGN ;
+	return action.sa_handler == SIG_IGN ; // NOLINT
 }
 
 void G::CleanupImp::installDefault( int signum )
@@ -203,7 +203,7 @@ void G::CleanupImp::installDefault( const G::SignalSafe & , int signum )
 
 void G::CleanupImp::installIgnore( int signum )
 {
-	install( signum , SIG_IGN , true ) ;
+	install( signum , SIG_IGN , true ) ; // NOLINT
 }
 
 void G::CleanupImp::install( int signum , Handler fn , bool do_throw )
@@ -211,7 +211,7 @@ void G::CleanupImp::install( int signum , Handler fn , bool do_throw )
 	// install the given handler, or the system default if null
 	struct ::sigaction action {} ;
 	action.sa_handler = fn ;
-	if( ::sigaction( signum , &action , nullptr ) && do_throw )
+	if( ::sigaction( signum , &action , nullptr ) != 0 && do_throw )
 		throw Cleanup::Error( "sigaction" ) ;
 }
 

src/glib/gdatetime.cpp

@@ -57,7 +57,8 @@ namespace G
 	}
 }
 
-G::BrokenDownTime::BrokenDownTime()
+G::BrokenDownTime::BrokenDownTime() :
+	m_tm{}
 {
 	m_tm.tm_isdst = -1 ;
 }
@@ -97,7 +98,7 @@ std::time_t G::BrokenDownTime::epochTimeFromUtcImp() const
 std::time_t G::BrokenDownTime::epochTimeFromUtcImp( bool & diff_set , std::time_t & diff ) const
 {
 	constexpr int day = 24 * 60 * 60 ;
-	constexpr std::time_t dt = 60 * 15 ; // india 30mins, nepal 45mins
+	constexpr std::time_t dt = 60 * 15 ; // india 30mins, nepal 45mins // NOLINT
 	constexpr std::time_t day_and_a_bit = day + dt ;
 	constexpr std::time_t t_rounding = 30 ;
 
@@ -136,7 +137,7 @@ G::BrokenDownTime G::BrokenDownTime::local( SystemTime t )
 {
 	BrokenDownTime tm ;
 	std::time_t s = t.s() ;
-	if( ! localtime_r( &s , &tm.m_tm ) )
+	if( localtime_r( &s , &tm.m_tm ) == nullptr )
 		throw DateTime::Error() ;
 	return tm ;
 }
@@ -145,7 +146,7 @@ G::BrokenDownTime G::BrokenDownTime::utc( SystemTime t )
 {
 	BrokenDownTime tm ;
 	std::time_t s = t.s() ;
-	if( ! gmtime_r( &s , &tm.m_tm ) )
+	if( gmtime_r( &s , &tm.m_tm ) == nullptr )
 		throw DateTime::Error() ;
 	return tm ;
 }
@@ -364,7 +365,7 @@ void G::SystemTime::operator+=( TimeInterval i )
 
 void G::SystemTime::streamOut( std::ostream & stream ) const
 {
-	std::streamsize w = stream.width() ;
+	int w = static_cast<int>( stream.width() ) ;
 	char c = stream.fill() ;
 	stream
 		<< s() << "."
@@ -630,7 +631,7 @@ void G::TimeInterval::operator-=( TimeInterval i )
 
 void G::TimeInterval::streamOut( std::ostream & stream ) const
 {
-	std::streamsize w = stream.width() ;
+	int w = static_cast<int>( stream.width() ) ;
 	char c = stream.fill() ;
 	stream
 		<< s() << "."

src/glib/gdef.h

@@ -1363,7 +1363,7 @@
 		#endif
 
 		#if ! GCONFIG_HAVE_CXX_ALIGNMENT
-			namespace std
+			namespace std // NOLINT
 			{
 				// missing in gcc 4.8.4 -- original copyright 2001-2016 FSF Inc, GPLv3
 				inline void * align( size_t align , size_t size , void * & ptr_inout , size_t & space ) noexcept

src/glib/gexception.cpp

@@ -100,18 +100,3 @@ G::Exception::Exception( const std::string & what , const std::string & more1 ,
 {
 }
 
-G::Exception G::Exception::translated() const
-{
-	try
-	{
-		std::string head = G::Str::head( what() , ": " , false ) ;
-		std::string tail = G::Str::tail( what() , ": " ) ;
-		std::string new_head = G::gettext( head.c_str() ) ;
-		return G::Exception( new_head , tail ) ;
-	}
-	catch( std::exception & )
-	{
-		return *this ;
-	}
-}
-

src/glib/gexception.h

@@ -67,11 +67,6 @@ public:
 
 	Exception( const std::string & what , const std::string & more1 , const std::string & more2 , const std::string & more3 ) ;
 		///< Constructor.
-
-	Exception translated() const ;
-		///< Returns a new exception that is possibly translated using
-		///< gettext(). (Use gettext_noop() in G_EXCEPTION declarations
-		///< to mark the string for translation.)
 } ;
 
 #define G_EXCEPTION_CLASS( class_name , description ) class class_name : public G::Exception { public: class_name() : G::Exception((description)) {} explicit class_name(const char *more) : G::Exception((description),more) {} explicit class_name(const std::string &more) : G::Exception((description),more) {} class_name(const std::string &more1,const std::string &more2) : G::Exception((description),more1,more2) {} class_name(const std::string &more1,const std::string &more2,const std::string &more3) : G::Exception((description),more1,more2,more3) {} }

src/glib/gfile.cpp

@@ -274,13 +274,14 @@ bool G::File::mkdirsr( int * ep , const Path & path , int limit )
 bool G::File::mkdirs( const Path & path , std::nothrow_t , int limit )
 {
 	int e = 0 ;
-	return mkdirsr( &e , path , limit ) ;
+	bool ok = mkdirsr( &e , path , limit ) ;
+	return ok || e == EEXIST ;
 }
 
 void G::File::mkdirs( const Path & path , int limit )
 {
 	int e = 0 ;
-	if( !mkdirsr(&e,path,limit) )
+	if( !mkdirsr(&e,path,limit) && e != EEXIST )
 		throw CannotMkdir( path.str() , e ? G::Process::strerror(e) : std::string() ) ;
 }
 

src/glib/gfile_win32.cpp

@@ -93,7 +93,7 @@ std::filebuf * G::File::open( std::filebuf & fb , const Path & path , InOut inou
 	inout == InOut::In ?
 		FileImp::open( fb , path.cstr() , std::ios_base::in | std::ios_base::binary ) :
 		FileImp::open( fb , path.cstr() , std::ios_base::out | std::ios_base::binary ) ;
-	return &fb ;
+	return fb.is_open() ? &fb : nullptr ;
 }
 
 int G::File::open( const char * path , InOutAppend mode ) noexcept
@@ -146,12 +146,16 @@ void G::File::close( int fd ) noexcept
 int G::File::mkdirImp( const Path & dir ) noexcept
 {
 	int rc = _mkdir( dir.cstr() ) ;
-	if( rc != 0 )
+	if( rc == 0 )
 	{
-		rc = G::Process::errno_() ;
+		return 0 ;
-		if( rc == 0 ) rc = EINVAL ;
+	}
+	else
+	{
+		int e = G::Process::errno_() ;
+		if( e == 0 ) e = EINVAL ;
+		return e ;
 	}
-	return rc ;
 }
 
 G::File::Stat G::File::statImp( const char * path , bool ) noexcept

src/glib/ghashstate.h

@@ -38,7 +38,7 @@ class G::HashStateImp
 {
 public:
 	template <typename U> static std::string extension( U n ) ;
-		///< Returns the given data size a four-character
+		///< Returns the given data size as a four-character
 		///< string.
 
 protected:
@@ -115,7 +115,7 @@ std::string G::HashState<N,U,S>::encode( const uint_type * values )
 	std::string result( N , '\0' ) ;
 	for( std::size_t i = 0U ; i < N/4 ; i++ )
 	{
-		convert_( values[i] , result.begin() + (i*4U) ) ;
+		convert_( values[i] , result.begin() + (i*4U) ) ; // NOLINT narrowing
 	}
 	return result ;
 }
@@ -126,7 +126,7 @@ std::string G::HashState<N,U,S>::encode( const uint_type * values , size_type n
 	std::string result( N+4U , '\0' ) ;
 	for( std::size_t i = 0U ; i < N/4 ; i++ )
 	{
-		convert_( values[i] , result.begin() + (i*4U) ) ;
+		convert_( values[i] , result.begin() + (i*4U) ) ; // NOLINT narrowing
 	}
 	convert_( n , result.begin() + N ) ;
 	return result ;
@@ -229,7 +229,7 @@ void G::HashState<N,U,S>::convert( const std::string & str , uint_type & n_out )
 template <unsigned int N, typename U, typename S>
 void G::HashState<N,U,S>::convert( const std::string & str , uint_type * state_out )
 {
-	for( unsigned int i = 0U ; i < (N/4U) ; i++ )
+	for( std::size_t i = 0U ; i < (N/4U) ; i++ )
 	{
 		convert( str.at(i*4U+3U) , str.at(i*4U+2U) , str.at(i*4U+1U) , str.at(i*4U+0U) , state_out[i] ) ;
 	}

src/glib/gidentity_win32.cpp

@@ -98,12 +98,12 @@ bool G::Identity::isRoot() const noexcept
 	return false ;
 }
 
-bool G::Identity::operator==( const Identity & other ) const noexcept
+bool G::Identity::operator==( const Identity & ) const noexcept
 {
 	return true ;
 }
 
-bool G::Identity::operator!=( const Identity & other ) const noexcept
+bool G::Identity::operator!=( const Identity & ) const noexcept
 {
 	return false ;
 }

src/glib/glogoutput.cpp

@@ -209,6 +209,7 @@ std::ostream & G::LogOutput::start( Log::Severity severity )
 		open( m_path , false ) ;
 
 	std::ostream & ss = LogOutputImp::ostream1() ;
+	ss << std::dec ;
 	if( m_exename.length() )
 		ss << m_exename << ": " ;
 	if( m_config.m_with_timestamp )

src/glib/gmd5.cpp

@@ -298,8 +298,8 @@ G::Md5Imp::big_t G::Md5Imp::digest::op( const block & m , aux_fn_t aux , big_t a
 G::Md5Imp::big_t G::Md5Imp::digest::rot32( small_t places , big_t n )
 {
 	// circular rotate of 32 LSBs, with corruption of higher bits
-	big_t overflow_mask = ( 1UL << places ) - 1UL ; // in case big_t is more than 32 bits
+	big_t overflow_mask = ( big_t(1U) << places ) - big_t(1U) ; // in case big_t is more than 32 bits
-	big_t overflow = ( n >> ( 32U - places ) ) ;
+	big_t overflow = ( n >> ( small_t(32U) - places ) ) ;
 	return ( n << places ) | ( overflow & overflow_mask ) ;
 }
 

src/glib/gnewprocess.h

@@ -29,6 +29,8 @@
 #include "gprocess.h"
 #include "gpath.h"
 #include "gstrings.h"
+#include <memory>
+#include <new>
 #include <string>
 #include <future>
 
@@ -207,7 +209,7 @@ public:
 		///< \code
 		///< std::promise<int,std::string> p ;
 		///< std::future<int,std::string> f = p.get_future() ;
-		///< std::thread t( std::bind(&NewPromiseWaitable::waitp,waitable,_1) , std::move(p) ) ;
+		///< std::thread t( std::bind(&NewProcessWaitable::waitp,waitable,_1) , std::move(p) ) ;
 		///< f.wait() ;
 		///< t.join() ;
 		///< int e = f.get() ;

src/glib/gnewprocess_unix.cpp

@@ -142,7 +142,7 @@ void G::NewProcess::kill( bool yield ) noexcept
 	if( yield )
 	{
 		G::threading::yield() ;
-		::close( ::open( "/dev/null" , O_RDONLY ) ) ; // hmm
+		::close( ::open( "/dev/null" , O_RDONLY ) ) ; // hmm // NOLINT
 		G::threading::yield() ;
 	}
 }
@@ -322,7 +322,7 @@ bool G::NewProcessImp::duplicate( Fd fd , int fd_std )
 	G_ASSERT( !(fd==Fd::pipe()) ) ;
 	if( fd == Fd::devnull() )
 	{
-		int fd_null = ::open( G::Path::nullDevice().cstr() , fd_std == STDIN_FILENO ? O_RDONLY : O_WRONLY ) ;
+		int fd_null = ::open( G::Path::nullDevice().cstr() , fd_std == STDIN_FILENO ? O_RDONLY : O_WRONLY ) ; // NOLINT
 		if( fd_null < 0 ) throw NewProcess::Error( "failed to open /dev/null" ) ;
 		::dup2( fd_null , fd_std ) ;
 		return true ;
@@ -429,7 +429,7 @@ G::NewProcessWaitable & G::NewProcessWaitable::wait()
 {
 	// (worker thread - keep it simple - never throws - does read then waitpid)
 	{
-		std::array<char,64U> discard ; // NOLINT cppcoreguidelines-pro-type-member-init
+		std::array<char,64U> discard {} ;
 		char * p = &m_buffer[0] ;
 		std::size_t space = m_buffer.size() ;
 		std::size_t size = 0U ;
@@ -469,7 +469,7 @@ G::NewProcessWaitable & G::NewProcessWaitable::wait()
 		errno = 0 ;
 		m_rc = ::waitpid( m_pid , &m_status , 0 ) ;
 		m_error = errno ;
-		if( m_rc >= 0 && ( WIFSTOPPED(m_status) || WIFCONTINUED(m_status) ) )
+		if( m_rc >= 0 && ( WIFSTOPPED(m_status) || WIFCONTINUED(m_status) ) ) // NOLINT
 			; // keep waiting
 		else if( m_rc == -1 && m_error == EINTR )
 			; // keep waiting
@@ -498,18 +498,18 @@ int G::NewProcessWaitable::get() const
 			ss << "errno=" << (m_read_error?m_read_error:m_error) ;
 			throw NewProcess::WaitError( ss.str() ) ;
 		}
-		else if( !WIFEXITED(m_status) )
+		else if( !WIFEXITED(m_status) ) // NOLINT
 		{
 			// uncaught signal
 			std::ostringstream ss ;
 			ss << "pid=" << m_pid ;
-			if( WIFSIGNALED(m_status) )
+			if( WIFSIGNALED(m_status) ) // NOLINT
-				ss << " signal=" << WTERMSIG(m_status) ;
+				ss << " signal=" << WTERMSIG(m_status) ; // NOLINT
 			throw NewProcess::ChildError( ss.str() ) ;
 		}
 		else
 		{
-			result = WEXITSTATUS( m_status ) ;
+			result = WEXITSTATUS( m_status ) ; // NOLINT
 		}
 	}
 	return result ;

src/glib/gpam.h

@@ -63,7 +63,7 @@ public:
 		const std::string in_type ; // "password", "prompt", "error", "info"
 		const std::string in ; // password prompt, non-password prompt, error text, infomation message, etc
 		std::string out ; // password, or whatever was prompted for
-		bool out_defined ; // to be set to true if 'out' is assigned
+		bool out_defined{false} ; // to be set to true if 'out' is assigned
 	} ;
 	class Error : public G::Exception /// An exception class for G::Pam.
 	{

src/glib/gpam_linux.cpp

@@ -54,24 +54,8 @@ class G::PamImp
 {
 public:
 	using Handle = pam_handle_t * ;
-
-private:
 	using Conversation = struct pam_conv ;
-	using Error = Pam::Error ;
-	using ItemArray = Pam::ItemArray ;
-	static constexpr int MAGIC = 3456 ;
-
-public:
-	Pam & m_pam ;
-	int m_magic ;
-	mutable int m_rc ; // required for pam_end()
-	Handle m_hpam ;
-	Conversation m_conv ;
-	bool m_silent ;
-
-public:
 	PamImp( Pam & pam , const std::string & app , const std::string & user , bool silent ) ;
-	~PamImp() ;
 	Handle hpam() const ;
 	bool silent() const ;
 	bool authenticate( bool ) ;
@@ -84,8 +68,24 @@ public:
 	std::string name() const ;
 
 public:
+	~PamImp() ;
 	PamImp( const PamImp & ) = delete ;
-	void operator=( const PamImp & ) = delete ;
+	PamImp( PamImp && ) = delete ;
+	PamImp & operator=( const PamImp & ) = delete ;
+	PamImp & operator=( PamImp && ) = delete ;
+
+public:
+	Pam & m_pam ;
+	int m_magic ;
+	mutable int m_rc ; // required for pam_end()
+	Handle m_hpam ;
+	Conversation m_conv ;
+	bool m_silent ;
+
+private:
+	using Error = Pam::Error ;
+	using ItemArray = Pam::ItemArray ;
+	static constexpr int MAGIC = 3456 ;
 
 private:
 	static int converseCallback( int n , G_PAM_CONST struct pam_message ** in ,
@@ -102,6 +102,8 @@ G::PamImp::PamImp( G::Pam & pam , const std::string & application , const std::s
 	m_pam(pam) ,
 	m_magic(MAGIC) ,
 	m_rc(PAM_SUCCESS) ,
+	m_hpam(nullptr) ,
+	m_conv{} ,
 	m_silent(silent)
 {
 	G_DEBUG( "G::PamImp::ctor: [" << application << "] [" << user << "]" ) ;
@@ -207,10 +209,10 @@ void G::PamImp::release( struct pam_response * rsp , std::size_t n )
 		for( std::size_t i = 0U ; i < n ; i++ )
 		{
 			if( rsp[i].resp != nullptr )
-				std::free( rsp[i].resp ) ;
+				std::free( rsp[i].resp ) ; // NOLINT
 		}
 	}
-	std::free( rsp ) ;
+	std::free( rsp ) ; // NOLINT
 }
 
 int G::PamImp::converseCallback( int n_in , G_PAM_CONST struct pam_message ** in ,
@@ -266,7 +268,7 @@ int G::PamImp::converseCallback( int n_in , G_PAM_CONST struct pam_message ** in
 		// allocate the response - treat "out" as a pointer to a pointer
 		// to a contiguous array of structures (see linux man pam_conv)
 		//
-		rsp = static_cast<struct pam_response*>( std::malloc(n*sizeof(struct pam_response)) ) ;
+		rsp = static_cast<struct pam_response*>( std::malloc(n*sizeof(struct pam_response)) ) ; // NOLINT
 		if( rsp == nullptr )
 			throw std::bad_alloc() ;
 		for( std::size_t j = 0U ; j < n ; j++ )
@@ -349,7 +351,7 @@ void G::PamImp::check( const std::string & op , int rc ) const
 char * G::PamImp::strdup_( const char * p )
 {
 	p = p ? p : "" ;
-	char * copy = static_cast<char*>( std::malloc(std::strlen(p)+1U) ) ;
+	char * copy = static_cast<char*>( std::malloc(std::strlen(p)+1U) ) ; // NOLINT
 	if( copy != nullptr )
 		std::strcpy( copy , p ) ; // NOLINT
 	return copy ;

src/glib/gpath.h

@@ -140,7 +140,7 @@ public:
 		///< Returns !isRelative().
 
 	bool isRelative() const ;
-		///< Returns true if the path is a relative path.
+		///< Returns true if the path is a relative path or empty().
 
 	void pathAppend( const std::string & tail ) ;
 		///< Appends a filename or a relative path to this path.

src/glib/gprocess_unix.cpp

@@ -235,9 +235,9 @@ std::string G::Process::exe()
 
 // ==
 
-G::Process::Id::Id() noexcept
+G::Process::Id::Id() noexcept :
+	m_pid(::getpid())
 {
-	m_pid = ::getpid() ;
 }
 
 std::string G::Process::Id::str() const

src/glib/groot.cpp

@@ -54,12 +54,14 @@ G::Root::Root( bool change_group ) :
 	}
 }
 
-G::Root::~Root()
+G::Root::~Root() // NOLINT bugprone-exception-escape
 {
 	if( m_this == this && m_initialised )
 	{
 		m_this = nullptr ;
-		Process::beOrdinary( m_nobody , m_change_group ) ; // std::terminate on error
+		int e_saved = Process::errno_() ;
+		Process::beOrdinary( m_nobody , m_change_group ) ; // can throw - std::terminate is correct
+		Process::errno_( SignalSafe() , e_saved ) ;
 	}
 }
 

src/glib/groot.h

@@ -64,7 +64,7 @@ public:
 		///< Constructor overload with explicit control over whether to change the
 		///< group-id or not.
 
-	~Root() ;
+	~Root() ; // NOLINT
 		///< Desctructor. Releases special privileges if this instance acquired them.
 		///< The implementation uses G::Process::beOrdinary(). Errors from seteuid()
 		///< will call Process::terminate().

src/glib/gstr.cpp

@@ -666,7 +666,7 @@ unsigned long G::StrImp::toULongHex( const std::string & s , bool limited )
 		else if( c >= 65U && c <= 70U ) c -= 55U ;
 		else if( c >= 48U && c <= 57U ) c -= 48U ;
 		else throw Str::InvalidFormat( "invalid hexadecimal" , s ) ;
-		n <<= 4 ;
+		n <<= 4U ;
 		n += c ;
 	}
 	return n ;
@@ -764,8 +764,8 @@ std::size_t G::StrImp::outputHex( Tout out , char c )
 	namespace imp = G::StrImp ;
 	std::size_t n = static_cast<unsigned char>( c ) ;
 	n &= 0xFFU ;
-	*out++ = imp::chars_hexmap[(n>>4)%16U] ;
+	*out++ = imp::chars_hexmap[(n>>4U)%16U] ;
-	*out++ = imp::chars_hexmap[(n>>0)%16U] ;
+	*out++ = imp::chars_hexmap[(n>>0U)%16U] ;
 	return 2U ;
 }
 
@@ -776,10 +776,10 @@ std::size_t G::StrImp::outputHex( Tout out , wchar_t c )
 	using uwchar_t = typename std::make_unsigned<wchar_t>::type ;
 	std::size_t n = static_cast<uwchar_t>( c ) ;
 	n &= 0xFFFFU ;
-	*out++ = imp::chars_hexmap[(n>>12)%16U] ;
+	*out++ = imp::chars_hexmap[(n>>12U)%16U] ;
-	*out++ = imp::chars_hexmap[(n>>8)%16U] ;
+	*out++ = imp::chars_hexmap[(n>>8U)%16U] ;
-	*out++ = imp::chars_hexmap[(n>>4)%16U] ;
+	*out++ = imp::chars_hexmap[(n>>4U)%16U] ;
-	*out++ = imp::chars_hexmap[(n>>0)%16U] ;
+	*out++ = imp::chars_hexmap[(n>>0U)%16U] ;
 	return 4U ;
 }
 
@@ -1443,7 +1443,7 @@ std::size_t G::Str::ifind( const std::string & s , const std::string & key , std
 {
 	namespace imp = G::StrImp ;
 	if( s.empty() || key.empty() || pos > s.length() ) return std::string::npos ;
-	auto p = std::search( s.begin()+pos , s.end() , key.begin() , key.end() , imp::imatchc ) ;
+	auto p = std::search( s.begin()+pos , s.end() , key.begin() , key.end() , imp::imatchc ) ; // NOLINT narrowing
 	return p == s.end() ? std::string::npos : std::distance(s.begin(),p) ;
 }
 

src/glib/gstringview.h

@@ -97,7 +97,7 @@ public:
 	}
 	constexpr static bool same( basic_string_view a , basic_string_view b ) noexcept
 	{
-		return a.size() == b.size() && StringViewImp::same( a.size() , a.data() , b.data() ) ;
+		return a.size() == b.size() && ( a.empty() || StringViewImp::same( a.size() , a.data() , b.data() ) ) ;
 	}
 	constexpr std::size_t size() const noexcept { return m_n ; }
 	constexpr std::size_t length() const noexcept { return m_n ; }
@@ -106,10 +106,10 @@ public:
 	void swap( basic_string_view<Tchar> & other ) noexcept { std::swap(m_p,other.m_p) ; std::swap(m_n,other.m_n) ; }
 	constexpr const Tchar & operator[]( std::size_t i ) const { return m_p[i] ; }
 	const Tchar & at( std::size_t i ) const { if( i >= m_n ) throw std::out_of_range("string_view") ; return m_p[i] ; }
-	const Tchar * begin() const noexcept { return m_p ; }
+	const Tchar * begin() const noexcept { return empty() ? nullptr : m_p ; }
-	const Tchar * cbegin() const noexcept { return m_p ; }
+	const Tchar * cbegin() const noexcept { return empty() ? nullptr : m_p ; }
-	const Tchar * end() const noexcept { return m_p + m_n ; }
+	const Tchar * end() const noexcept { return empty() ? nullptr : (m_p+m_n) ; }
-	const Tchar * cend() const noexcept { return m_p + m_n ; }
+	const Tchar * cend() const noexcept { return empty() ? nullptr : (m_p+m_n) ; }
 	bool operator==( const basic_string_view<Tchar> & other ) const noexcept { return compare(other) == 0 ; }
 	bool operator!=( const basic_string_view<Tchar> & other ) const noexcept { return compare(other) != 0 ; }
 	bool operator<( const basic_string_view<Tchar> & other ) const noexcept { return compare(other) < 0 ; }
@@ -118,16 +118,17 @@ public:
 	bool operator>=( const basic_string_view<Tchar> & other ) const noexcept { return compare(other) >= 0 ; }
 	int compare( const basic_string_view<Tchar> & other ) const noexcept
 	{
-		int rc = std::char_traits<Tchar>::compare( m_p , other.m_p , std::min(m_n,other.m_n) ) ;
+		int rc = ( empty() || other.empty() ) ? 0 : std::char_traits<Tchar>::compare( m_p , other.m_p , std::min(m_n,other.m_n) ) ;
 		return rc == 0 ? ( m_n < other.m_n ? -1 : (m_n==other.m_n?0:1) ) : rc ;
 	}
 	string_view substr( std::size_t pos , std::size_t count = npos ) const
 	{
-		if( pos > m_n ) throw std::out_of_range( "string_view" ) ;
+		if( empty() || pos > m_n ) throw std::out_of_range( "string_view" ) ;
 		return string_view( m_p + pos , std::min(m_n-pos,count) ) ;
 	}
 	std::size_t find( Tchar c ) const noexcept
 	{
+		if( empty() ) return std::string::npos ;
 		const Tchar * p = m_p ;
 		std::size_t n = m_n ;
 		for( std::size_t pos = 0U ; n ; p++ , n-- , pos++ )
@@ -137,11 +138,28 @@ public:
 		}
 		return std::string::npos ;
 	}
-	std::size_t find_first_of( basic_string_view<Tchar> chars ) const noexcept
+	std::size_t find( const Tchar * substr_p , std::size_t pos , std::size_t substr_n ) const
 	{
-		const Tchar * p = m_p ;
+		return find( basic_string_view<Tchar>(substr_p,substr_n) , pos ) ;
-		std::size_t n = m_n ;
+	}
-		for( std::size_t pos = 0U ; n ; p++ , n-- , pos++ )
+	std::size_t find( basic_string_view<Tchar> substr , std::size_t pos = 0U ) const
+	{
+		if( empty() || pos >= m_n ) return std::string::npos ;
+		if( substr.empty() ) return pos ;
+		auto const end = m_p + m_n ;
+		auto p = std::search( m_p+pos , end , substr.m_p , substr.m_p+substr.m_n ) ;
+		return p == end ? std::string::npos : std::distance(m_p,p) ;
+	}
+	std::size_t find_first_of( const Tchar * chars , std::size_t pos , std::size_t chars_size ) const noexcept
+	{
+		return find_first_of( basic_string_view<Tchar>(chars,chars_size) , pos ) ;
+	}
+	std::size_t find_first_of( basic_string_view<Tchar> chars , std::size_t pos = 0U ) const noexcept
+	{
+		if( empty() || pos >= m_n || chars.empty() ) return std::string::npos ;
+		const Tchar * p = m_p + pos ;
+		std::size_t n = m_n - pos ;
+		for( ; n ; p++ , n-- , pos++ )
 		{
 			const std::size_t i_end = chars.size() ;
 			for( std::size_t i = 0U ; i < i_end ; i++ )
@@ -152,11 +170,16 @@ public:
 		}
 		return std::string::npos ;
 	}
-	std::size_t find_first_not_of( basic_string_view<Tchar> chars ) const noexcept
+	std::size_t find_first_not_of( const Tchar * chars , std::size_t pos , std::size_t chars_size ) const noexcept
 	{
-		const Tchar * p = m_p ;
+		return find_first_not_of( basic_string_view<Tchar>(chars,chars_size) , pos ) ;
-		std::size_t n = m_n ;
+	}
-		for( std::size_t pos = 0U ; n ; p++ , n-- , pos++ )
+	std::size_t find_first_not_of( basic_string_view<Tchar> chars , std::size_t pos = 0U ) const noexcept
+	{
+		if( empty() || pos >= m_n || chars.empty() ) return std::string::npos ;
+		const Tchar * p = m_p + pos ;
+		std::size_t n = m_n - pos ;
+		for( ; n ; p++ , n-- , pos++ )
 		{
 			bool match = false ;
 			const std::size_t i_end = chars.size() ;
@@ -172,7 +195,7 @@ public:
 	}
 	std::basic_string<Tchar> sv_to_string_imp() const
 	{
-		return std::basic_string<Tchar>( m_p , m_n ) ;
+		return empty() ? std::basic_string<Tchar>() : std::basic_string<Tchar>( m_p , m_n ) ;
 	}
 
 private:
@@ -180,8 +203,6 @@ private:
 	std::size_t m_n{0U} ;
 } ;
 
-static_assert( G::string_view("foo",nullptr).length() == 3U , "" ) ;
-
 namespace G
 {
 	template <typename Tchar> std::basic_string<Tchar> sv_to_string( basic_string_view<Tchar> sv )
@@ -189,18 +210,38 @@ namespace G
 		// (greppable name -- remove when using c++17 std::string_view)
 		return std::basic_string<Tchar>( sv.sv_to_string_imp() ) ;
 	}
-	inline std::ostream & operator<<( std::ostream & stream , const string_view & s )
+	inline std::ostream & operator<<( std::ostream & stream , const string_view & sv )
 	{
-		return stream.write( s.data() , s.size() ) ;
+		if( !sv.empty() )
+			stream.write( sv.data() , sv.size() ) ; // NOLINT narrowing
+		return stream ;
 	}
-	inline std::wostream & operator<<( std::wostream & stream , const wstring_view & s )
+	inline std::wostream & operator<<( std::wostream & stream , const wstring_view & sv )
 	{
-		return stream.write( s.data() , s.size() ) ;
+		if( !sv.empty() )
+			stream.write( sv.data() , sv.size() ) ; // NOLINT narrowing
+		return stream ;
 	}
 	template <typename Tchar> void swap( basic_string_view<Tchar> & a , basic_string_view<Tchar> b ) noexcept
 	{
 		a.swap( b ) ;
 	}
+	inline bool operator==( const std::string & s , string_view sv )
+	{
+		return sv.empty() ? s.empty() : ( 0 == s.compare( 0 , s.size() , sv.data() , sv.size() ) ) ;
+	}
+	inline bool operator==( string_view sv , const std::string & s )
+	{
+		return sv.empty() ? s.empty() : ( 0 == s.compare( 0 , s.size() , sv.data() , sv.size() ) ) ;
+	}
+	inline bool operator!=( const std::string & s , string_view sv )
+	{
+		return !(s == sv) ;
+	}
+	inline bool operator!=( string_view sv , const std::string & s )
+	{
+		return !(sv == s) ;
+	}
 }
 
 #endif

src/glib/gstrmacros.h

@@ -25,11 +25,19 @@
 #ifdef G_STR_IMP
 #undef G_STR_IMP
 #endif
-#define G_STR_IMP(X) #X
-
 #ifdef G_STR
 #undef G_STR
 #endif
-#define G_STR(X) G_STR_IMP(X)
+#ifdef G_STR_PASTE_IMP
+#undef G_STR_PASTE_IMP
+#endif
+#ifdef G_STR_PASTE
+#undef G_STR_PASTE
+#endif
+
+#define G_STR_IMP(a) #a
+#define G_STR(a) G_STR_IMP(a)
+#define G_STR_PASTE_IMP(a,b) a##b
+#define G_STR_PASTE(a,b) G_STR_PASTE_IMP(a,b)
 
 #endif

src/glib/gtime.cpp

@@ -31,43 +31,31 @@ G::Time::Time( int hh , int mm , int ss ) :
 {
 }
 
-G::Time::Time( const BrokenDownTime & tm )
+G::Time::Time( const BrokenDownTime & tm ) :
+	m_hh(tm.hour()) ,
+	m_mm(tm.min()) ,
+	m_ss(tm.sec())
 {
-	m_hh = tm.hour() ;
-	m_mm = tm.min() ;
-	m_ss = tm.sec() ;
 }
 
-G::Time::Time()
+G::Time::Time() :
+	Time(SystemTime::now().utc())
 {
-	BrokenDownTime tm = SystemTime::now().utc() ;
-	m_hh = tm.hour() ;
-	m_mm = tm.min() ;
-	m_ss = tm.sec() ;
 }
 
-G::Time::Time( SystemTime t )
+G::Time::Time( SystemTime t ) :
+	Time(t.utc())
 {
-	BrokenDownTime tm = t.utc() ;
-	m_hh = tm.hour() ;
-	m_mm = tm.min() ;
-	m_ss = tm.sec() ;
 }
 
-G::Time::Time( const LocalTime & )
+G::Time::Time( const LocalTime & ) :
+	Time(SystemTime::now().local())
 {
-	BrokenDownTime tm = SystemTime::now().local() ;
-	m_hh = tm.hour() ;
-	m_mm = tm.min() ;
-	m_ss = tm.sec() ;
 }
 
-G::Time::Time( SystemTime t , const LocalTime & )
+G::Time::Time( SystemTime t , const LocalTime & ) :
+	Time(t.local())
 {
-	BrokenDownTime tm = t.local() ;
-	m_hh = tm.hour() ;
-	m_mm = tm.min() ;
-	m_ss = tm.sec() ;
 }
 
 int G::Time::hours() const
@@ -121,9 +109,9 @@ G::Time G::Time::at( unsigned int s )
 	unsigned int hh = s / 3600U ;
 	unsigned int mm_ss = s - (hh*3600U) ;
 	return {
-		std::max(0,std::min(static_cast<int>(hh),23)) ,
+		std::max(0,std::min(23,static_cast<int>(hh))) ,
-		std::max(0,std::min(static_cast<int>(mm_ss/60U),59)) ,
+		std::max(0,std::min(59,static_cast<int>(mm_ss/60U))) ,
-		std::max(0,std::min(static_cast<int>(mm_ss%60U),59)) } ;
+		std::max(0,std::min(59,static_cast<int>(mm_ss%60U))) } ;
 }
 
 bool G::Time::operator==( const Time & other ) const

src/gnet/Makefile.am

@@ -17,14 +17,6 @@
 
 noinst_LIBRARIES = libgnet.a
 
-if GCONFIG_IPV6
-IP46_SOURCES = gaddress_ipv6.cpp
-EXTRA_DIST_IP46 = gaddress_ipv4.cpp
-else
-IP46_SOURCES = gaddress_ipv4.cpp
-EXTRA_DIST_IP46 = gaddress_ipv6.cpp
-endif
-
 if GCONFIG_WINDOWS
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gssl -I$(top_srcdir)/src/win32
@@ -41,7 +33,6 @@ if GCONFIG_INTERFACE_NAMES
 
 EXTRA_DIST = \
 	$(EXTRA_DIST_COMMON) \
-	$(EXTRA_DIST_IP46) \
 	ginterfaces_unix.cpp \
 	ginterfaces_none.cpp
 
@@ -53,7 +44,6 @@ else
 
 EXTRA_DIST = \
 	$(EXTRA_DIST_COMMON) \
-	$(EXTRA_DIST_IP46) \
 	ginterfaces_unix.cpp \
 	ginterfaces_common.cpp \
 	ginterfaces_win32.cpp
@@ -64,13 +54,13 @@ INTERFACES_SOURCES = \
 endif
 
 libgnet_a_SOURCES = \
-	$(IP46_SOURCES) \
 	gaddresslocal_none.cpp \
 	gaddresslocal.h \
 	gaddress4.cpp \
 	gaddress4.h \
 	gaddress6.cpp \
 	gaddress6.h \
+	gaddress.cpp \
 	gaddress.h \
 	gclient.cpp \
 	gclient.h \
@@ -215,12 +205,11 @@ EXTRA_DIST = \
 	$(EXTRA_DIST_COMMON) \
 	$(EXTRA_DIST_UDS) \
 	$(EXTRA_DIST_INTERFACES) \
-	$(EXTRA_DIST_EVENTLOOP) \
+	$(EXTRA_DIST_EVENTLOOP)
-	$(EXTRA_DIST_IP46)
 
 libgnet_a_SOURCES = \
-	$(IP46_SOURCES) \
 	$(UDS_SOURCES) \
+	gaddress.cpp \
 	gaddress.h \
 	gaddresslocal.h \
 	gaddress4.h \

src/gnet/Makefile.in

@@ -110,11 +110,11 @@ am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libgnet_a_AR = $(AR) $(ARFLAGS)
 libgnet_a_LIBADD =
-am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
+am__libgnet_a_SOURCES_DIST = gaddresslocal_none.cpp \
-	gaddresslocal_none.cpp gaddresslocal_unix.cpp gaddress.h \
+	gaddresslocal_unix.cpp gaddress.cpp gaddress.h gaddresslocal.h \
-	gaddresslocal.h gaddress4.h gaddress4.cpp gaddress6.h \
+	gaddress4.h gaddress4.cpp gaddress6.h gaddress6.cpp \
-	gaddress6.cpp gclient.cpp gclient.h gclientptr.cpp \
+	gclient.cpp gclient.h gclientptr.cpp gclientptr.h \
-	gclientptr.h gconnection.cpp gconnection.h gdescriptor.h \
+	gconnection.cpp gconnection.h gdescriptor.h \
 	gdescriptor_unix.cpp gdnsblock.cpp gdnsblock.h gdnsmessage.cpp \
 	gdnsmessage.h gevent.h geventhandler.cpp geventhandler.h \
 	geventhandlerlist.cpp geventhandlerlist.h \
@@ -135,20 +135,18 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 	gtask.cpp gtask.h gtimer.cpp gtimer.h gtimerlist.cpp \
 	gtimerlist.h gdescriptor_win32.cpp geventloop_win32.cpp \
 	gfutureevent_win32.cpp gsocket_win32.cpp
-@GCONFIG_IPV6_FALSE@am__objects_1 = gaddress_ipv4.$(OBJEXT)
+@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_1 = gaddresslocal_none.$(OBJEXT)
-@GCONFIG_IPV6_TRUE@am__objects_1 = gaddress_ipv6.$(OBJEXT)
+@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_1 = gaddresslocal_unix.$(OBJEXT)
-@GCONFIG_UDS_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = gaddresslocal_none.$(OBJEXT)
+@GCONFIG_EPOLL_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = geventloop_select.$(OBJEXT)
-@GCONFIG_UDS_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = gaddresslocal_unix.$(OBJEXT)
+@GCONFIG_EPOLL_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_2 = geventloop_epoll.$(OBJEXT)
-@GCONFIG_EPOLL_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = geventloop_select.$(OBJEXT)
+@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = ginterfaces_none.$(OBJEXT)
-@GCONFIG_EPOLL_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = geventloop_epoll.$(OBJEXT)
+@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@am__objects_3 = ginterfaces_none.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@am__objects_4 = ginterfaces_none.$(OBJEXT)
+@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_3 = ginterfaces_unix.$(OBJEXT) \
-@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@am__objects_4 = ginterfaces_none.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_FALSE@am__objects_4 = ginterfaces_unix.$(OBJEXT) \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_FALSE@	ginterfaces_common.$(OBJEXT)
-@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@am__objects_4 = ginterfaces_common.$(OBJEXT) \
+@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@am__objects_3 = ginterfaces_common.$(OBJEXT) \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_win32.$(OBJEXT)
 @GCONFIG_WINDOWS_FALSE@am_libgnet_a_OBJECTS = $(am__objects_1) \
-@GCONFIG_WINDOWS_FALSE@	$(am__objects_2) gaddress4.$(OBJEXT) \
+@GCONFIG_WINDOWS_FALSE@	gaddress.$(OBJEXT) gaddress4.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gaddress6.$(OBJEXT) gclient.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gclientptr.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gconnection.$(OBJEXT) \
@@ -158,12 +156,12 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 @GCONFIG_WINDOWS_FALSE@	geventhandler.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	geventhandlerlist.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	geventloggingcontext.$(OBJEXT) \
-@GCONFIG_WINDOWS_FALSE@	geventloop.$(OBJEXT) $(am__objects_3) \
+@GCONFIG_WINDOWS_FALSE@	geventloop.$(OBJEXT) $(am__objects_2) \
 @GCONFIG_WINDOWS_FALSE@	gexceptionhandler.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gexceptionsink.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gexceptionsource.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gfutureevent_unix.$(OBJEXT) \
-@GCONFIG_WINDOWS_FALSE@	$(am__objects_4) glinebuffer.$(OBJEXT) \
+@GCONFIG_WINDOWS_FALSE@	$(am__objects_3) glinebuffer.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	glinestore.$(OBJEXT) glocal.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	glocation.$(OBJEXT) gmonitor.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gmultiserver.$(OBJEXT) \
@@ -175,10 +173,11 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 @GCONFIG_WINDOWS_FALSE@	gsocketprotocol.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gsocks.$(OBJEXT) gtask.$(OBJEXT) \
 @GCONFIG_WINDOWS_FALSE@	gtimer.$(OBJEXT) gtimerlist.$(OBJEXT)
-@GCONFIG_WINDOWS_TRUE@am_libgnet_a_OBJECTS = $(am__objects_1) \
+@GCONFIG_WINDOWS_TRUE@am_libgnet_a_OBJECTS =  \
 @GCONFIG_WINDOWS_TRUE@	gaddresslocal_none.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gaddress4.$(OBJEXT) gaddress6.$(OBJEXT) \
-@GCONFIG_WINDOWS_TRUE@	gclient.$(OBJEXT) gclientptr.$(OBJEXT) \
+@GCONFIG_WINDOWS_TRUE@	gaddress.$(OBJEXT) gclient.$(OBJEXT) \
+@GCONFIG_WINDOWS_TRUE@	gclientptr.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gconnection.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gdescriptor_win32.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gdnsblock.$(OBJEXT) \
@@ -193,7 +192,7 @@ am__libgnet_a_SOURCES_DIST = gaddress_ipv4.cpp gaddress_ipv6.cpp \
 @GCONFIG_WINDOWS_TRUE@	gexceptionsink.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gexceptionsource.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gfutureevent_win32.$(OBJEXT) \
-@GCONFIG_WINDOWS_TRUE@	$(am__objects_4) glinebuffer.$(OBJEXT) \
+@GCONFIG_WINDOWS_TRUE@	$(am__objects_3) glinebuffer.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	glinestore.$(OBJEXT) glocal.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	glocation.$(OBJEXT) gmonitor.$(OBJEXT) \
 @GCONFIG_WINDOWS_TRUE@	gmultiserver.$(OBJEXT) \
@@ -221,9 +220,8 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/gaddress4.Po \
+am__depfiles_remade = ./$(DEPDIR)/gaddress.Po ./$(DEPDIR)/gaddress4.Po \
-	./$(DEPDIR)/gaddress6.Po ./$(DEPDIR)/gaddress_ipv4.Po \
+	./$(DEPDIR)/gaddress6.Po ./$(DEPDIR)/gaddresslocal_none.Po \
-	./$(DEPDIR)/gaddress_ipv6.Po ./$(DEPDIR)/gaddresslocal_none.Po \
 	./$(DEPDIR)/gaddresslocal_unix.Po ./$(DEPDIR)/gclient.Po \
 	./$(DEPDIR)/gclientptr.Po ./$(DEPDIR)/gconnection.Po \
 	./$(DEPDIR)/gdescriptor_unix.Po \
@@ -432,10 +430,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libgnet.a
-@GCONFIG_IPV6_FALSE@IP46_SOURCES = gaddress_ipv4.cpp
-@GCONFIG_IPV6_TRUE@IP46_SOURCES = gaddress_ipv6.cpp
-@GCONFIG_IPV6_FALSE@EXTRA_DIST_IP46 = gaddress_ipv6.cpp
-@GCONFIG_IPV6_TRUE@EXTRA_DIST_IP46 = gaddress_ipv4.cpp
 @GCONFIG_WINDOWS_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gssl
 @GCONFIG_WINDOWS_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/src/glib -I$(top_srcdir)/src/gssl -I$(top_srcdir)/src/win32
 @GCONFIG_WINDOWS_FALSE@EXTRA_DIST_COMMON = \
@@ -454,14 +448,12 @@ noinst_LIBRARIES = libgnet.a
 
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@EXTRA_DIST = \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@	$(EXTRA_DIST_COMMON) \
-@GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@	$(EXTRA_DIST_IP46) \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_unix.cpp \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_common.cpp \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_win32.cpp
 
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@EXTRA_DIST = \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	$(EXTRA_DIST_COMMON) \
-@GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	$(EXTRA_DIST_IP46) \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_unix.cpp \
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_none.cpp
 
@@ -469,8 +461,7 @@ noinst_LIBRARIES = libgnet.a
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_COMMON) \
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_UDS) \
 @GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_INTERFACES) \
-@GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_EVENTLOOP) \
+@GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_EVENTLOOP)
-@GCONFIG_WINDOWS_FALSE@	$(EXTRA_DIST_IP46)
 
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@INTERFACES_SOURCES = \
 @GCONFIG_INTERFACE_NAMES_FALSE@@GCONFIG_WINDOWS_FALSE@	ginterfaces_none.cpp
@@ -487,8 +478,8 @@ noinst_LIBRARIES = libgnet.a
 @GCONFIG_INTERFACE_NAMES_TRUE@@GCONFIG_WINDOWS_TRUE@	ginterfaces_win32.cpp
 
 @GCONFIG_WINDOWS_FALSE@libgnet_a_SOURCES = \
-@GCONFIG_WINDOWS_FALSE@	$(IP46_SOURCES) \
 @GCONFIG_WINDOWS_FALSE@	$(UDS_SOURCES) \
+@GCONFIG_WINDOWS_FALSE@	gaddress.cpp \
 @GCONFIG_WINDOWS_FALSE@	gaddress.h \
 @GCONFIG_WINDOWS_FALSE@	gaddresslocal.h \
 @GCONFIG_WINDOWS_FALSE@	gaddress4.h \
@@ -565,13 +556,13 @@ noinst_LIBRARIES = libgnet.a
 @GCONFIG_WINDOWS_FALSE@	gtimerlist.h
 
 @GCONFIG_WINDOWS_TRUE@libgnet_a_SOURCES = \
-@GCONFIG_WINDOWS_TRUE@	$(IP46_SOURCES) \
 @GCONFIG_WINDOWS_TRUE@	gaddresslocal_none.cpp \
 @GCONFIG_WINDOWS_TRUE@	gaddresslocal.h \
 @GCONFIG_WINDOWS_TRUE@	gaddress4.cpp \
 @GCONFIG_WINDOWS_TRUE@	gaddress4.h \
 @GCONFIG_WINDOWS_TRUE@	gaddress6.cpp \
 @GCONFIG_WINDOWS_TRUE@	gaddress6.h \
+@GCONFIG_WINDOWS_TRUE@	gaddress.cpp \
 @GCONFIG_WINDOWS_TRUE@	gaddress.h \
 @GCONFIG_WINDOWS_TRUE@	gclient.cpp \
 @GCONFIG_WINDOWS_TRUE@	gclient.h \
@@ -725,10 +716,9 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress4.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress6.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv4.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddress_ipv6.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddresslocal_none.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gaddresslocal_unix.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gclient.Po@am__quote@ # am--include-marker
@@ -918,10 +908,9 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
+		-rm -f ./$(DEPDIR)/gaddress.Po
 	-rm -f ./$(DEPDIR)/gaddress4.Po
 	-rm -f ./$(DEPDIR)/gaddress6.Po
-	-rm -f ./$(DEPDIR)/gaddress_ipv4.Po
-	-rm -f ./$(DEPDIR)/gaddress_ipv6.Po
 	-rm -f ./$(DEPDIR)/gaddresslocal_none.Po
 	-rm -f ./$(DEPDIR)/gaddresslocal_unix.Po
 	-rm -f ./$(DEPDIR)/gclient.Po
@@ -1011,10 +1000,9 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/gaddress.Po
 	-rm -f ./$(DEPDIR)/gaddress4.Po
 	-rm -f ./$(DEPDIR)/gaddress6.Po
-	-rm -f ./$(DEPDIR)/gaddress_ipv4.Po
-	-rm -f ./$(DEPDIR)/gaddress_ipv6.Po
 	-rm -f ./$(DEPDIR)/gaddresslocal_none.Po
 	-rm -f ./$(DEPDIR)/gaddresslocal_unix.Po
 	-rm -f ./$(DEPDIR)/gclient.Po

src/gnet/gaddress.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // ===
 ///
-/// \file gaddress_ipv6.cpp
+/// \file gaddress.cpp
 ///
 
 #include "gdef.h"
@@ -108,7 +108,8 @@ GNet::Address::Address( const sockaddr * addr , socklen_t len , bool ipv6_scope_
 
 GNet::Address::Address( const std::string & s )
 {
-	std::string r1 , r2 ;
+	std::string r1 ;
+	std::string r2 ;
 	if( s.empty() )
 		throw Address::Error( "empty string" ) ;
 	else if( AddressLocal::af() && isFamilyLocal(s) )
@@ -123,7 +124,8 @@ GNet::Address::Address( const std::string & s )
 
 GNet::Address::Address( const std::string & s , NotLocal )
 {
-	std::string r1 , r2 ;
+	std::string r1 ;
+	std::string r2 ;
 	if( s.empty() )
 		throw Address::Error( "empty string" ) ;
 	else if( Address4::af() && Address4::validString(s,&r1) )
@@ -136,7 +138,8 @@ GNet::Address::Address( const std::string & s , NotLocal )
 
 GNet::Address::Address( const std::string & host_part , const std::string & port_part )
 {
-	std::string r1 , r2 ;
+	std::string r1 ;
+	std::string r2 ;
 	if( host_part.empty() )
 		throw Address::Error( "empty string" ) ;
 	else if( AddressLocal::af() && isFamilyLocal( host_part ) )
@@ -151,7 +154,8 @@ GNet::Address::Address( const std::string & host_part , const std::string & port
 
 GNet::Address::Address( const std::string & host_part , unsigned int port )
 {
-	std::string r1 , r2 ;
+	std::string r1 ;
+	std::string r2 ;
 	if( host_part.empty() )
 		throw Address::Error( "empty string" ) ;
 	else if( AddressLocal::af() && isFamilyLocal( host_part ) )

src/gnet/gaddress_ipv4.cpp

@@ -1,421 +0,0 @@
-//
-// Copyright (C) 2001-2021 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/>.
-// ===
-///
-/// \file gaddress_ipv4.cpp
-///
-
-#include "gdef.h"
-#include "gaddress4.h"
-#include "gaddress.h"
-#include "gassert.h"
-#include <algorithm> // std::swap()
-#include <utility> // std::swap()
-#include <cstring>
-
-namespace GNet
-{
-	class Address6
-	{
-	} ;
-	class AddressLocal
-	{
-	} ;
-	namespace AddressImp
-	{
-		void check( GNet::Address::Family f )
-		{
-			if( !Address::supports(f) )
-				throw Address::BadFamily() ;
-		}
-	}
-}
-
-bool GNet::Address::supports( Family f )
-{
-	return f == Family::ipv4 ;
-}
-
-bool GNet::Address::supports( int af , int )
-{
-	return af == AF_INET ;
-}
-
-bool GNet::Address::supports( const Address::Domain & , int domain )
-{
-	return domain == Address4::domain() ;
-}
-
-GNet::Address GNet::Address::defaultAddress()
-{
-	return { Family::ipv4 , 0U } ;
-}
-
-GNet::Address::Address( Family f , unsigned int port ) :
-	m_ipv4(std::make_unique<Address4>(port))
-{
-	AddressImp::check( f ) ;
-}
-
-GNet::Address::Address( const AddressStorage & storage ) :
-	m_ipv4(std::make_unique<Address4>(storage.p(),storage.n()))
-{
-}
-
-GNet::Address::Address( const sockaddr * addr , socklen_t len ) :
-	m_ipv4(std::make_unique<Address4>(addr,len))
-{
-}
-
-GNet::Address::Address( const sockaddr * addr , socklen_t len , bool ) :
-	m_ipv4(std::make_unique<Address4>(addr,len))
-{
-}
-
-GNet::Address::Address( const std::string & s ) :
-	m_ipv4(std::make_unique<Address4>(s))
-{
-}
-
-GNet::Address::Address( const std::string & s , NotLocal ) :
-	m_ipv4(std::make_unique<Address4>(s))
-{
-}
-
-GNet::Address::Address( const std::string & host_part , const std::string & port_part ) :
-	m_ipv4(std::make_unique<Address4>(host_part,port_part))
-{
-}
-
-GNet::Address::Address( const std::string & s , unsigned int port ) :
-	m_ipv4(std::make_unique<Address4>(s,port))
-{
-}
-
-GNet::Address::Address( Family f , unsigned int port , int loopback_overload ) :
-	m_ipv4(std::make_unique<Address4>(port,loopback_overload))
-{
-	AddressImp::check( f ) ;
-}
-
-GNet::Address::Address( const Address & other ) :
-	m_ipv4(std::make_unique<Address4>(*other.m_ipv4))
-{
-}
-
-GNet::Address::Address( Address && other ) noexcept
-= default ;
-
-GNet::Address::~Address()
-= default;
-
-void GNet::Address::swap( Address & other ) noexcept
-{
-	using std::swap ;
-	swap( m_ipv4 , other.m_ipv4 ) ;
-}
-
-GNet::Address & GNet::Address::operator=( const Address & other )
-{
-	Address(other).swap( *this ) ;
-	return *this ;
-}
-
-GNet::Address & GNet::Address::operator=( Address && other ) noexcept
-= default ;
-
-GNet::Address GNet::Address::parse( const std::string & s )
-{
-	return Address( s ) ;
-}
-
-GNet::Address GNet::Address::parse( const std::string & s , Address::NotLocal not_local )
-{
-	return { s , not_local } ;
-}
-
-GNet::Address GNet::Address::parse( const std::string & host_part , unsigned int port )
-{
-	return { host_part , port } ;
-}
-
-GNet::Address GNet::Address::parse( const std::string & host_part , const std::string & port_part )
-{
-	return { host_part , port_part } ;
-}
-
-bool GNet::Address::isFamilyLocal( const std::string & )
-{
-	return false ;
-}
-
-GNet::Address GNet::Address::loopback( Family f , unsigned int port )
-{
-	return Address( f , port , 1 ) ;
-}
-
-GNet::Address & GNet::Address::setPort( unsigned int port )
-{
-	m_ipv4->setPort( port ) ;
-	return *this ;
-}
-
-GNet::Address & GNet::Address::setScopeId( unsigned long )
-{
-	return *this ; // not relevant for ipv4
-}
-
-bool GNet::Address::setZone( const std::string & )
-{
-	return true ; // not relevant for ipv4
-}
-
-unsigned int GNet::Address::bits() const
-{
-	return m_ipv4->bits() ;
-}
-
-bool GNet::Address::isLoopback() const
-{
-	return m_ipv4->isLoopback() ;
-}
-
-bool GNet::Address::isLocal( std::string & reason ) const
-{
-	return m_ipv4->isLocal( reason ) ;
-}
-
-bool GNet::Address::isLinkLocal() const
-{
-	return m_ipv4->isLinkLocal() ;
-}
-
-bool GNet::Address::isUniqueLocal() const
-{
-	return m_ipv4->isUniqueLocal() ;
-}
-
-bool GNet::Address::isAny() const
-{
-	return m_ipv4->isAny() ;
-}
-
-bool GNet::Address::is4() const
-{
-	return true ;
-}
-
-bool GNet::Address::is6() const
-{
-	return false ;
-}
-
-bool GNet::Address::same( const Address & other , bool ) const
-{
-	return m_ipv4->same( *other.m_ipv4 ) ;
-}
-
-bool GNet::Address::operator==( const Address & other ) const
-{
-	return m_ipv4->same( *other.m_ipv4 ) ;
-}
-
-bool GNet::Address::operator!=( const Address & other ) const
-{
-	return !( *this == other ) ;
-}
-
-bool GNet::Address::sameHostPart( const Address & other ) const
-{
-	return m_ipv4->sameHostPart(*other.m_ipv4) ;
-}
-
-std::string GNet::Address::displayString( bool ) const
-{
-	return m_ipv4->displayString() ;
-}
-
-std::string GNet::Address::hostPartString( bool ) const
-{
-	return m_ipv4->hostPartString() ;
-}
-
-std::string GNet::Address::queryString() const
-{
-	return m_ipv4->queryString() ;
-}
-
-bool GNet::Address::validString( const std::string & s , std::string * reason_p )
-{
-	return Address4::validString( s , reason_p ) ;
-}
-
-bool GNet::Address::validString( const std::string & s , NotLocal , std::string * reason_p )
-{
-	return Address4::validString( s , reason_p ) ;
-}
-
-bool GNet::Address::validStrings( const std::string & s1 , const std::string & s2 , std::string * reason_p )
-{
-	return Address4::validStrings( s1 , s2 , reason_p ) ;
-}
-
-sockaddr * GNet::Address::address()
-{
-	return m_ipv4->address() ;
-}
-
-const sockaddr * GNet::Address::address() const
-{
-	return m_ipv4->address() ;
-}
-
-socklen_t GNet::Address::length() const
-{
-	return Address4::length() ;
-}
-
-unsigned int GNet::Address::port() const
-{
-	return m_ipv4->port() ;
-}
-
-unsigned long GNet::Address::scopeId( unsigned long default_ ) const
-{
-	return default_ ;
-}
-
-bool GNet::Address::validPort( unsigned int port )
-{
-	return Address4::validPort( port ) ;
-}
-
-bool GNet::Address::validData( const sockaddr * addr , socklen_t len )
-{
-	return Address4::validData( addr , len ) ;
-}
-
-int GNet::Address::domain( Family family )
-{
-	return family == Family::ipv4 ? Address4::domain() : 0 ;
-}
-
-GNet::Address::Family GNet::Address::family() const
-{
-	return Family::ipv4 ;
-}
-
-int GNet::Address::af() const
-{
-	return AF_INET ;
-}
-
-G::StringArray GNet::Address::wildcards() const
-{
-	return m_ipv4->wildcards() ;
-}
-
-// ==
-
-//| \class GNet::AddressStorageImp
-/// A pimple-pattern implementation class used by GNet::AddressStorage.
-///
-class GNet::AddressStorageImp
-{
-public:
-	sockaddr_storage u ;
-	socklen_t n ;
-} ;
-
-// ==
-
-GNet::AddressStorage::AddressStorage() :
-	m_imp(std::make_unique<AddressStorageImp>())
-{
-	static_assert( sizeof(Address4::sockaddr_type) <= sizeof(sockaddr_storage) , "" ) ;
-	static_assert( alignof(Address4::sockaddr_type) <= alignof(sockaddr_storage) , "" ) ;
-	m_imp->n = sizeof( sockaddr_storage ) ;
-}
-
-GNet::AddressStorage::~AddressStorage()
-= default;
-
-sockaddr * GNet::AddressStorage::p1()
-{
-	return reinterpret_cast<sockaddr*>(&(m_imp->u)) ;
-}
-
-socklen_t * GNet::AddressStorage::p2()
-{
-	return &m_imp->n ;
-}
-
-const sockaddr * GNet::AddressStorage::p() const
-{
-	return reinterpret_cast<const sockaddr*>(&(m_imp->u)) ;
-}
-
-socklen_t GNet::AddressStorage::n() const
-{
-	return m_imp->n ;
-}
-
-// ==
-
-#if ! GCONFIG_HAVE_INET_PTON
-// fallback implementation for inet_pton() -- see gdef.h
-int GNet::inet_pton_imp( int f , const char * p , void * result )
-{
-	if( p == nullptr || result == nullptr )
-	{
-		return 0 ; // just in case
-	}
-	else if( f == AF_INET )
-	{
-		sockaddr_in sa {} ;
-		sa.sin_family = AF_INET ;
-		sa.sin_addr.s_addr = inet_addr( p ) ;
-		std::memcpy( result , &sa.sin_addr , sizeof(sa.sin_addr) ) ;
-		return 1 ;
-	}
-	else
-	{
-		return -1 ;
-	}
-}
-#endif
-
-#if ! GCONFIG_HAVE_INET_NTOP
-// fallback implementation for inet_ntop() -- see gdef.h
-const char * GNet::inet_ntop_imp( int f , void * ap , char * buffer , std::size_t n )
-{
-	if( f == AF_INET )
-	{
-		std::ostringstream ss ;
-		struct in_addr a ;
-		std::memcpy( &a , ap , sizeof(a) ) ;
-		ss << inet_ntoa( a ) ; // ignore warnings - this is not used if inet_ntop is available
-		if( n <= ss.str().length() ) return nullptr ;
-		std::strncpy( buffer , ss.str().c_str() , n ) ;
-		return buffer ;
-	}
-	else
-	{
-		return nullptr ;
-	}
-}
-#endif
-

src/gnet/gdnsmessage.cpp

@@ -27,6 +27,7 @@
 #include <vector>
 #include <iomanip>
 #include <sstream>
+#include <stdexcept>
 
 GNet::DnsMessageRequest::DnsMessageRequest( const std::string & type , const std::string & hostname , unsigned int id )
 {
@@ -224,10 +225,14 @@ GNet::DnsMessage GNet::DnsMessage::rejection( const DnsMessage & message , unsig
 
 void GNet::DnsMessage::reject( unsigned int rcode )
 {
-	m_buffer.at(2U) |= 0x80 ; // QR
+	if( m_buffer.size() < 10U )
-	m_buffer.at(3U) &= 0xf0 ; m_buffer.at(3U) |= ( rcode & 0x0f ) ; // RCODE
+		throw std::out_of_range( "dns message buffer too small" ) ;
-	m_buffer.at(6U) = 0U ; m_buffer.at(7U) = 0U ; // ANCOUNT
+
-	m_buffer.at(8U) = 0U ; m_buffer.at(9U) = 0U ; // NSCOUNT
+	unsigned char * buffer = reinterpret_cast<unsigned char*>(&m_buffer[0]) ;
+	buffer[2U] |= 0x80U ; // QR
+	buffer[3U] &= 0xf0U ; buffer[3U] |= ( rcode & 0x0fU ) ; // RCODE
+	buffer[6U] = 0U ; buffer[7U] = 0U ; // ANCOUNT
+	buffer[8U] = 0U ; buffer[9U] = 0U ; // NSCOUNT
 
 	// chop off RRs
 	unsigned int new_size = 12U ; // HEADER size
@@ -266,7 +271,8 @@ GNet::Address GNet::DnsMessage::rrAddress( unsigned int record_index ) const
 
 // ==
 
-GNet::DnsMessageQuestion::DnsMessageQuestion( const DnsMessage & msg , unsigned int offset )
+GNet::DnsMessageQuestion::DnsMessageQuestion( const DnsMessage & msg , unsigned int offset ) :
+	m_size(0U)
 {
 	m_qname = DnsMessageNameParser::read( msg , offset ) ;
 	m_size = DnsMessageNameParser::size( msg , offset ) + 2U + 2U ; // QNAME + QTYPE + QCLASS
@@ -341,6 +347,7 @@ GNet::DnsMessageRR::DnsMessageRR( const DnsMessage & msg , unsigned int offset )
 	m_offset(offset) ,
 	m_size(0U) ,
 	m_type(0U) ,
+	m_class(0U) ,
 	m_rdata_offset(0U) ,
 	m_rdata_size(0U)
 {

src/gnet/ginterfaces_none.cpp

@@ -20,6 +20,7 @@
 
 #include "gdef.h"
 #include "ginterfaces.h"
+#include "gstr.h"
 
 GNet::Interfaces::Interfaces()
 = default;

src/gnet/glinebuffer.cpp

@@ -44,12 +44,7 @@ void GNet::LineBuffer::clear()
 	if( !transparent() )
 		m_expect = 0U ;
 
-	G_ASSERT( m_in.empty() && empty() ) ;
+	G_ASSERT( m_in.empty() && state().empty() ) ;
-}
-
-bool GNet::LineBuffer::empty() const
-{
-	return state().empty() ;
 }
 
 void GNet::LineBuffer::add( const char * data , std::size_t size )
@@ -244,8 +239,8 @@ GNet::LineBufferConfig::LineBufferConfig( const std::string & eol , std::size_t
 
 GNet::LineBufferConfig GNet::LineBufferConfig::transparent()
 {
-	const std::size_t inf = ~(std::size_t(0)) ;
+	static constexpr std::size_t inf = ~(std::size_t(0)) ;
-	//G_ASSERT( (inf+1U) == 0U ) ;
+	static_assert( (inf+1U) == 0U , "" ) ;
 	return LineBufferConfig( std::string(1U,'\n') , 0U , 0U , inf ) ;
 }
 

src/gnet/glinebuffer.h

@@ -188,9 +188,6 @@ public:
 		///< line ending.
 		///< Precondition: more()
 
-	bool empty() const ;
-		///< Returns state().empty().
-
 	std::size_t eolsize() const ;
 		///< Returns the size of line-ending associated with the
 		///< current data(). This will be zero for a fixed-size

src/gnet/glinestore.cpp

@@ -336,7 +336,7 @@ std::size_t GNet::LineStore::find( const std::string & s , std::size_t startpos
 std::size_t GNet::LineStore::search( std::string::const_iterator begin , std::string::const_iterator end ,
 	std::size_t startpos ) const
 {
-	return std::search( LineStoreIterator(*this)+startpos , LineStoreIterator(*this,true) , begin , end ).pos() ;
+	return std::search( LineStoreIterator(*this)+startpos , LineStoreIterator(*this,true) , begin , end ).pos() ; // NOLINT narrowing
 }
 
 std::size_t GNet::LineStore::findSubStringAtEnd( const std::string & s , std::size_t startpos ) const
@@ -359,7 +359,7 @@ std::size_t GNet::LineStore::findSubStringAtEnd( const std::string & s , std::si
 			{
 				// compare leading substring with the end of the store
 				const LineStoreIterator end( *this , true ) ;
-				LineStoreIterator p = end - s_size ;
+				LineStoreIterator p = end - s_size ; // NOLINT narrowing
 				if( imp::std_equal(s_start,s_end,p,end) )
 				{
 					result = p.pos() ;

src/gnet/glocal.cpp

@@ -22,7 +22,6 @@
 #include "glocal.h"
 #include "ghostname.h"
 #include "gresolver.h"
-#include "ginterfaces.h"
 #include "glog.h"
 #include <sstream>
 

src/gnet/gmultiserver.cpp

@@ -44,8 +44,8 @@ GNet::MultiServer::MultiServer( ExceptionSink es , const G::StringArray & interf
 	m_interfaces.erase( std::unique(m_interfaces.begin(),m_interfaces.end()) , m_interfaces.end() ) ;
 
 	// build a listening address list from explicit addresses and/or interface names
-	G::StringArray empty_names ; // interface names having no addresses
 	G::StringArray used_names ; // interface names having one or more addresses
+	G::StringArray empty_names ; // interface names having no addresses
 	G::StringArray bad_names ; // non-address non-interface names
 	AddressList address_list = addresses( port , used_names , empty_names , bad_names ) ;
 

src/gnet/gresolverfuture.cpp

@@ -29,7 +29,7 @@
 
 GNet::ResolverFuture::ResolverFuture( const std::string & host , const std::string & service , int family ,
 	bool dgram , bool for_async_hint ) :
-		m_numeric_service(false) ,
+		m_numeric_service(!service.empty() && G::Str::isNumeric(service)) ,
 		m_socktype(dgram?SOCK_DGRAM:SOCK_STREAM) ,
 		m_host(host) ,
 		m_host_p(m_host.c_str()) ,
@@ -40,9 +40,8 @@ GNet::ResolverFuture::ResolverFuture( const std::string & host , const std::stri
 		m_rc(0) ,
 		m_ai(nullptr)
 {
-	m_numeric_service = !service.empty() && G::Str::isNumeric(service) ;
 	std::memset( &m_ai_hint , 0 , sizeof(m_ai_hint) ) ;
-	m_ai_hint.ai_flags = AI_CANONNAME |
+	m_ai_hint.ai_flags = AI_CANONNAME | // NOLINT
 		( family == AF_UNSPEC ? AI_ADDRCONFIG : 0 ) |
 		( m_numeric_service ? AI_NUMERICSERV : 0 ) ;
 	m_ai_hint.ai_family = family ;

src/gnet/gsocket.cpp

@@ -31,7 +31,7 @@ namespace GNet
 {
 	namespace StreamSocketImp /// An implementation namespace for G::StreamSocket.
 	{
-		struct Options /// StreamSocket options
+		struct Options /// StreamSocket options.
 		{
 			enum class Linger { default_ , zero , nolinger } ;
 			Linger create_linger {Linger::nolinger} ;
@@ -42,7 +42,7 @@ namespace GNet
 	}
 	namespace SocketImp /// An implementation namespace for G::Socket.
 	{
-		struct Options /// Socket options
+		struct Options /// Socket options.
 		{
 			bool connect_pureipv6 {true} ;
 			bool bind_pureipv6 {true} ;

src/gnet/gsocketprotocol.cpp

@@ -32,6 +32,7 @@
 #include "glog.h"
 #include <memory>
 #include <numeric>
+#include <algorithm>
 
 //| \class GNet::SocketProtocolImp
 /// A pimple-pattern implementation class used by GNet::SocketProtocol.
@@ -165,9 +166,7 @@ GNet::SocketProtocolImp::~SocketProtocolImp()
 
 void GNet::SocketProtocolImp::setReadBufferSize( std::size_t n )
 {
-	m_read_buffer_size = n ;
+	m_read_buffer_size = std::max( std::size_t(1U) , n ) ;
-	if( m_read_buffer_size == 0U )
-		m_read_buffer_size = 1U ;
 }
 
 void GNet::SocketProtocolImp::onSecureConnectionTimeout()

src/gnet/gsocks.cpp

@@ -30,7 +30,7 @@ GNet::Socks::Socks( const Location & location ) :
 	if( location.socks() )
 	{
 		unsigned int far_port = location.socksFarPort() ;
-		if( !Address::validPort(far_port) )
+		if( !Address::validPort(far_port) || far_port > 0xffffU )
 			throw SocksError( "invalid port" ) ;
 
 		m_request = buildPdu( location.socksFarHost() , far_port ) ;

src/gnet/gtimerlist.cpp

@@ -138,11 +138,10 @@ const GNet::TimerBase * GNet::TimerList::findSoonest() const
 {
 	G_ASSERT( !m_locked ) ;
 	TimerBase * result = nullptr ;
-	auto end = m_list.cend() ;
+	for( const auto & t : m_list )
-	for( auto p = m_list.cbegin() ; p != end ; ++p )
 	{
-		if( (*p).m_timer != nullptr && (*p).m_timer->active() && ( result == nullptr || (*p).m_timer->t() < result->t() ) )
+		if( t.m_timer != nullptr && t.m_timer->active() && ( result == nullptr || t.m_timer->t() < result->t() ) )
-			result = (*p).m_timer ;
+			result = t.m_timer ;
 	}
 	return result ;
 }

src/gpop/gpopserverprotocol.cpp

@@ -179,7 +179,7 @@ bool GPop::ServerProtocol::sendContentLine( std::string & line , bool & stop )
 
 	// read the line of text
 	line.erase( 1U ) ; // leave "."
-	G::Str::readLineFrom( *(m_content.get()) , crlf() , line , false/*erase*/ ) ;
+	G::Str::readLineFrom( *m_content , crlf() , line , false/*erase*/ ) ;
 
 	// add crlf and choose an offset
 	bool eof = m_content->fail() || m_content->bad() ;

src/gsmtp/gadminserver.cpp

@@ -222,7 +222,7 @@ void GSmtp::AdminServerPeer::flush()
 	else
 	{
 		m_client_ptr.reset( std::make_unique<GSmtp::Client>( GNet::ExceptionSink(m_client_ptr,m_es.esrc()) ,
-			GNet::Location(m_remote_address) , m_server.clientSecrets() , m_server.clientConfig() ) ) ;
+			m_server.ff() , GNet::Location(m_remote_address) , m_server.clientSecrets() , m_server.clientConfig() ) ) ;
 
 		m_client_ptr->sendMessagesFrom( m_server.store() ) ; // once connected
 		// no sendLine() -- sends "OK" or "error:" when complete -- see AdminServerPeer::clientDone()
@@ -317,7 +317,7 @@ void GSmtp::AdminServerPeer::sendList( std::shared_ptr<MessageStore::Iterator> i
 		std::unique_ptr<StoredMessage> message( ++iter ) ;
 		if( message == nullptr ) break ;
 		if( !first ) ss << eol() ;
-		ss << message->name() ;
+		ss << message->id().str() ;
 	}
 
 	std::string result = ss.str() ;
@@ -340,9 +340,9 @@ bool GSmtp::AdminServerPeer::notifying() const
 // ===
 
 GSmtp::AdminServer::AdminServer( GNet::ExceptionSink es , MessageStore & store ,
-	G::Slot::Signal<const std::string&> & forward_request ,
+	FilterFactory & ff , G::Slot::Signal<const std::string&> & forward_request ,
 	const GNet::ServerPeerConfig & server_peer_config , const GNet::ServerConfig & server_config ,
-	const GSmtp::Client::Config & client_config , const GAuth::Secrets & client_secrets ,
+	const GSmtp::Client::Config & client_config , const GAuth::SaslClientSecrets & client_secrets ,
 	const G::StringArray & interfaces , unsigned int port , bool allow_remote ,
 	const std::string & remote_address , unsigned int connection_timeout ,
 	const G::StringMap & info_commands , const G::StringMap & config_commands ,
@@ -350,6 +350,7 @@ GSmtp::AdminServer::AdminServer( GNet::ExceptionSink es , MessageStore & store ,
 		GNet::MultiServer(es,interfaces,port,"admin",server_peer_config,server_config) ,
 		m_forward_timer(*this,&AdminServer::onForwardTimeout,es) ,
 		m_store(store) ,
+		m_ff(ff) ,
 		m_forward_request(forward_request) ,
 		m_client_config(client_config) ,
 		m_client_secrets(client_secrets) ,
@@ -436,7 +437,12 @@ GSmtp::MessageStore & GSmtp::AdminServer::store()
 	return m_store ;
 }
 
-const GAuth::Secrets & GSmtp::AdminServer::clientSecrets() const
+GSmtp::FilterFactory & GSmtp::AdminServer::ff()
+{
+	return m_ff ;
+}
+
+const GAuth::SaslClientSecrets & GSmtp::AdminServer::clientSecrets() const
 {
 	return m_client_secrets ;
 }

src/gsmtp/gadminserver.h

@@ -119,10 +119,10 @@ private:
 class GSmtp::AdminServer : public GNet::MultiServer
 {
 public:
-	AdminServer( GNet::ExceptionSink , MessageStore & store ,
+	AdminServer( GNet::ExceptionSink , MessageStore & store , FilterFactory & ff ,
 		G::Slot::Signal<const std::string&> & forward_request ,
 		const GNet::ServerPeerConfig & server_peer_config , const GNet::ServerConfig & server_config ,
-		const GSmtp::Client::Config & client_config , const GAuth::Secrets & client_secrets ,
+		const GSmtp::Client::Config & client_config , const GAuth::SaslClientSecrets & client_secrets ,
 		const G::StringArray & interfaces , unsigned int port , bool allow_remote ,
 		const std::string & remote_address , unsigned int connection_timeout ,
 		const G::StringMap & info_commands , const G::StringMap & config_commands ,
@@ -139,7 +139,11 @@ public:
 		///< Returns a reference to the message store, as
 		///< passed in to the constructor.
 
-	const GAuth::Secrets & clientSecrets() const ;
+	FilterFactory & ff() ;
+		///< Returns a reference to the filter factory, as
+		///< passed in to the constructor.
+
+	const GAuth::SaslClientSecrets & clientSecrets() const ;
 		///< Returns a reference to the client secrets object, as passed
 		///< in to the constructor. This is a client-side secrets file,
 		///< used to authenticate ourselves with a remote server.
@@ -178,9 +182,10 @@ private:
 private:
 	GNet::Timer<AdminServer> m_forward_timer ;
 	MessageStore & m_store ;
+	FilterFactory & m_ff ;
 	G::Slot::Signal<const std::string&> & m_forward_request ;
 	GSmtp::Client::Config m_client_config ;
-	const GAuth::Secrets & m_client_secrets ;
+	const GAuth::SaslClientSecrets & m_client_secrets ;
 	bool m_allow_remote ;
 	std::string m_remote_address ;
 	unsigned int m_connection_timeout ;