Include address declared malformed, in error message

diff --git a/src/src/verify.c b/src/src/verify.c
index 125df8d91854b90f790815f9f140927ed6616aeb..5c0a3e4080aea8d81e6736f6b341e9b0fe59beca 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -2958,7 +2958,7 @@ dots). */
 for (t = ss; isdigit(*t) || *t == '.'; ) t++;
 if (!*t  || (*t == '/' && t != ss))
   {
-  *error = US"malformed IPv4 address or address mask";
+  *error = string_sprintf("malformed IPv4 address or address mask: %.*s", (int)(t - ss), ss);
   return ERROR;
   }
 

diff --git a/test/stderr/0002 b/test/stderr/0002
index 62cc48c9d0b9ea5164abca79a228c80124f89a54..c8e10ef9eb4ada8c4a92906a60530cf65583b7eb 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -742,9 +742,9 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
  1.2.3.4 in "1.2.3"?
   list element: 1.2.3
-  1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask)
+  1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask: 1.2.3)
   1.2.3.4 in "1.2.3.4/abc"?
    list element: 1.2.3.4/abc
-   1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask)
+   1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask: 1.2.3.4)
   search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0475 b/test/stderr/0475
index c3d08c60307706c310cf4a9a754a1c9102482c56..4626506f53a9d395f47b00dc8765b4190febc663 100644 (file)
--- a/test/stderr/0475
+++ b/test/stderr/0475
@@ -25,7 +25,7 @@ LOG: H=(test) [V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown looku
 >>> check hosts = 1.2.3/24
 >>> host in "1.2.3/24"?
 >>>  list element: 1.2.3/24
->>>  host in "1.2.3/24"? no (malformed IPv4 address or address mask)
+>>>  host in "1.2.3/24"? no (malformed IPv4 address or address mask: 1.2.3)
 >>>  deny: condition test failed in ACL "a2"
 >>>  end of ACL "a2": implicit DENY
 LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a2@b>