Lookups: avoid leaking user/passwd from server spec to log. Bug 3066

[exim.git] / src / src / exinext.src

diff --git a/src/src/exinext.src b/src/src/exinext.src
index 91380186747240b0c31d0bfa6a5e992970c68216..882ad5f6076ed1d7ec7cd6a7268b13cc06fcbe7f 100644 (file)
--- a/src/src/exinext.src
+++ b/src/src/exinext.src
@@ -1,5 +1,6 @@
 #! /bin/sh
 
+# Copyright (c) The Exim Maintainers 2023
 # Copyright (c) University of Cambridge, 1995 - 2007
 # See the file NOTICE for conditions of use and distribution.
 
@@ -25,7 +26,7 @@ config=
 eximmacdef=
 exim_path=
 
-if test "x$1" = x--version
+if [ "x$1" = x--version -o "x$1" = x-v ]
 then
     echo "`basename $0`: $0"
     echo "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION"
@@ -162,6 +163,7 @@ perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain $config
 
   if (scalar(@list) == 0)
     {
+    push(@list, $subject) if $subject =~ /^\w{6}-\w{11}-\w{4}$/;
     push(@list, $subject) if $subject =~ /^\w{6}-\w{6}-\w{2}$/;
 
     if ($subject !~ /\@/ && $subject !~ /\./)