Merge branch '4.next'

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/ChangeLog
Simple merge

diff --cc doc/doc-txt/NewStuff
Simple merge

diff --cc src/src/acl.c
Simple merge

diff --cc src/src/functions.h
Simple merge

diff --cc src/src/globals.c
Simple merge

diff --cc src/src/globals.h
Simple merge

diff --cc src/src/malware.c
Simple merge

diff --cc src/src/match.c
Simple merge

diff --cc src/src/parse.c
Simple merge

diff --cc src/src/receive.c
index 5471aa7cb94aa009ccc3c77a0f4cc5cfccc8e17a,47c5977ee53db44ae0af187a3968ea64a5126ac9..3a9a91a81ef8620c6731a9851d346af57feef082
--- 1/src/src/receive.c
--- 2/src/src/receive.c
+++ b/src/src/receive.c
@@@ -1663,9 -1663,10 +1663,9 @@@ int  process_info_len = Ustrlen(process
  int  error_rc = error_handling == ERRORS_SENDER
        ? errors_sender_rc : EXIT_FAILURE;
  int  header_size = 256;
- int  id_resolution = 0;
 -int  start, end, domain;
  int  had_zero = 0;
  int  prevlines_length = 0;
+ const int id_resolution = BASE_62 == 62 ? 5000 : 10000;
  
  int ptr = 0;
  

diff --cc src/src/smtp_in.c
Simple merge

diff --cc src/src/tls-gnu.c
Simple merge

diff --cc src/src/transports/appendfile.c
Simple merge

diff --cc src/src/transports/smtp.c
Simple merge

diff --cc test/scripts/0000-Basic/0002
index e74ca6e39607e38734efe84d0aed348168a25f64,db3eae6be4f80dc967f81a2bf50ef0fdfb03cacc..463ad96e95222de94b67b03784ffcf05a8a4a518
--- 1/test/scripts/0000-Basic/0002
--- 2/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@@ -249,8 -249,7 +249,9 @@@ mask:   ${mask:192.168.10.206/0
  mask:   ${mask:192.168.10.206}
  mask:   ${mask:a.b.c.d}
  mask:   ${mask:2a00:2:3:4:5:6:7:8/79}
 +mask:   ${mask:2a00:2:3:4:5:6:7:8/128}
 +mask:   ${mask:2a00:2:3:4:5:6:7:8/129}
+ mask_n: ${mask_n:2a00:2:3:4:5:6:7:8/79}
  ipv6denorm: ${ipv6denorm:::1}
  ipv6denorm: ${ipv6denorm:fe00::1}
  ipv6denorm: ${ipv6denorm:192.168.0.1}

diff --cc test/stdout/0002
index f6f722e472a002eeef2ac36db295390cb4f5faee,5c8c2520c3f4eb298df4fa2b13756e400fd31733..f340b9426679d2672a3f54525dd5bd9745dd6017
--- 1/test/stdout/0002
--- 2/test/stdout/0002
+++ b/test/stdout/0002
@@@ -231,8 -231,7 +231,9 @@@ newline    tab\134backslash ~tilde\177DEL\
  > Failed: missing mask value in "192.168.10.206"
  > Failed: "a.b.c.d" is not an IP address
  > mask:   2a00.0002.0003.0004.0004.0000.0000.0000/79
 +> mask:   2a00.0002.0003.0004.0005.0006.0007.0008/128
 +> Failed: mask value too big in "2a00:2:3:4:5:6:7:8/129"
+ > mask_n: 2a00:2:3:4:4::/79
  > ipv6denorm: 0000:0000:0000:0000:0000:0000:0000:0001
  > ipv6denorm: fe00:0000:0000:0000:0000:0000:0000:0001
  > ipv6denorm: 0000:0000:0000:0000:0000:ffff:c0a8:0001