Taint: fix off-by-one in is_tainted(). Bug 2634

[users/heiko/exim.git] / test / stderr / 0388

diff --git a/test/stderr/0388 b/test/stderr/0388
index 512f340211b538c471185807c2258ae21483c03e..468eae32d10dcc5122b78ca2e7e9c9a4911efa7e 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -38,6 +38,7 @@ expanded list of hosts = '127.0.0.1 : V4NET.0.0.0' options = ''
 set transport smtp
 finding IP address for 127.0.0.1
 calling host_find_byname
 set transport smtp
 finding IP address for 127.0.0.1
 calling host_find_byname

+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 fully qualified name = 127.0.0.1


@@ -47,6 +48,7 @@ get[host|ipnode]byname[2] looked up these IP addresses:
 remote host address is the local host: y: configured to try delivery anyway
 finding IP address for V4NET.0.0.0
 calling host_find_byname
 remote host address is the local host: y: configured to try delivery anyway
 finding IP address for V4NET.0.0.0
 calling host_find_byname

+host_fake_gethostbyname returned 1 (HOST_NOT_FOUND)

 using host_fake_gethostbyname for V4NET.0.0.0 (IPv4)
 fully qualified name = V4NET.0.0.0
 MUNGED: ::1 will be omitted in what follows
 using host_fake_gethostbyname for V4NET.0.0.0 (IPv4)
 fully qualified name = V4NET.0.0.0
 MUNGED: ::1 will be omitted in what follows


@@ -55,7 +57,7 @@ get[host|ipnode]byname[2] looked up these IP addresses:
 queued for smtp transport: local_part = x
 domain = y
   errors_to=NULL
 queued for smtp transport: local_part = x
 domain = y
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r1 router
   envelope to: x@y
   transport: smtp
 routed by r1 router
   envelope to: x@y
   transport: smtp


@@ -70,8 +72,6 @@ After routing:
   Deferred addresses:
 search_tidyup called
 search_tidyup called
   Deferred addresses:
 search_tidyup called
 search_tidyup called

-fresh-exec forking for transport
-fresh-exec forked for transport: npppp

 changed uid/gid: remote delivery to x@y with transport=smtp
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp
 changed uid/gid: remote delivery to x@y with transport=smtp
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp


@@ -171,8 +171,6 @@ LOG: MAIN
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 end of retry processing
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 end of retry processing

-fresh-exec forking for bounce-message
-fresh-exec forked for bounce-message: npppp

 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective


@@ -228,8 +226,6 @@ Size of headers = sss
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 search_tidyup called
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 search_tidyup called

-bounce-message forking for local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp

 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective