Log local IP on delivery log line, under the incoming_interface log selector. Bug 507

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

diff --git a/test/stderr/0123 b/test/stderr/0123
index dd5101ebc49853cf9c089c4c54e6a5679b2df54e..72eaef139b89a6cf348c9462eee19909605b5615 100644 (file)
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -3,6 +3,12 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user

+DSN: l1 propagating DSN
+DSN: l2 propagating DSN
+DSN: l3 propagating DSN
+DSN: c1 propagating DSN
+DSN: c2 propagating DSN
+DSN: c3 propagating DSN

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID


@@ -20,7 +26,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
 search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases1
+  0TESTSUITE/aux-fixed/0123.aliases1

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   type=lsearch key="x"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   type=lsearch key="x"


@@ -39,8 +45,8 @@ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
 search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases2
-  :TESTSUITE/aux-fixed/0123.aliases1
+  0TESTSUITE/aux-fixed/0123.aliases2
+  0TESTSUITE/aux-fixed/0123.aliases1

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   type=lsearch key="x"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   type=lsearch key="x"


@@ -57,12 +63,12 @@ calling l3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases3}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
 Too many lookup files open
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases3}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases1
+  closing 0TESTSUITE/aux-fixed/0123.aliases1

 search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases3
-  :TESTSUITE/aux-fixed/0123.aliases2
+  0TESTSUITE/aux-fixed/0123.aliases3
+  0TESTSUITE/aux-fixed/0123.aliases2

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   type=lsearch key="x"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   type=lsearch key="x"


@@ -79,12 +85,12 @@ calling c1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases4}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
 Too many lookup files open
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases4}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases2
+  closing 0TESTSUITE/aux-fixed/0123.aliases2

 search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases4
-  :TESTSUITE/aux-fixed/0123.aliases3
+  0TESTSUITE/aux-fixed/0123.aliases4
+  0TESTSUITE/aux-fixed/0123.aliases3

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   type=lsearch key="x"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   type=lsearch key="x"


@@ -101,12 +107,12 @@ calling c2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases5}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
 Too many lookup files open
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases5}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases3
+  closing 0TESTSUITE/aux-fixed/0123.aliases3

 search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases5
-  :TESTSUITE/aux-fixed/0123.aliases4
+  0TESTSUITE/aux-fixed/0123.aliases5
+  0TESTSUITE/aux-fixed/0123.aliases4

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   type=lsearch key="x"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   type=lsearch key="x"


@@ -123,12 +129,12 @@ calling c3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases6}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
 Too many lookup files open
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases6}}
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases4
+  closing 0TESTSUITE/aux-fixed/0123.aliases4

 search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   key="x" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases6
-  :TESTSUITE/aux-fixed/0123.aliases5
+  0TESTSUITE/aux-fixed/0123.aliases6
+  0TESTSUITE/aux-fixed/0123.aliases5

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   type=lsearch key="x"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   type=lsearch key="x"


@@ -153,12 +159,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases5
+  closing 0TESTSUITE/aux-fixed/0123.aliases5

 search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases1
-  :TESTSUITE/aux-fixed/0123.aliases6
+  0TESTSUITE/aux-fixed/0123.aliases1
+  0TESTSUITE/aux-fixed/0123.aliases6

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   type=lsearch key="y"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   type=lsearch key="y"


@@ -176,12 +182,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases6
+  closing 0TESTSUITE/aux-fixed/0123.aliases6

 search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases2
-  :TESTSUITE/aux-fixed/0123.aliases1
+  0TESTSUITE/aux-fixed/0123.aliases2
+  0TESTSUITE/aux-fixed/0123.aliases1

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   type=lsearch key="y"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   type=lsearch key="y"


@@ -199,12 +205,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases1
+  closing 0TESTSUITE/aux-fixed/0123.aliases1

 search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases3
-  :TESTSUITE/aux-fixed/0123.aliases2
+  0TESTSUITE/aux-fixed/0123.aliases3
+  0TESTSUITE/aux-fixed/0123.aliases2

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   type=lsearch key="y"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   type=lsearch key="y"


@@ -222,12 +228,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases2
+  closing 0TESTSUITE/aux-fixed/0123.aliases2

 search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases4
-  :TESTSUITE/aux-fixed/0123.aliases3
+  0TESTSUITE/aux-fixed/0123.aliases4
+  0TESTSUITE/aux-fixed/0123.aliases3

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   type=lsearch key="y"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   type=lsearch key="y"


@@ -245,12 +251,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases3
+  closing 0TESTSUITE/aux-fixed/0123.aliases3

 search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases5
-  :TESTSUITE/aux-fixed/0123.aliases4
+  0TESTSUITE/aux-fixed/0123.aliases5
+  0TESTSUITE/aux-fixed/0123.aliases4

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   type=lsearch key="y"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   type=lsearch key="y"


@@ -268,12 +274,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases4
+  closing 0TESTSUITE/aux-fixed/0123.aliases4

 search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   key="y" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases6
-  :TESTSUITE/aux-fixed/0123.aliases5
+  0TESTSUITE/aux-fixed/0123.aliases6
+  0TESTSUITE/aux-fixed/0123.aliases5

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   type=lsearch key="y"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   type=lsearch key="y"


@@ -298,12 +304,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases5
+  closing 0TESTSUITE/aux-fixed/0123.aliases5

 search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases1
-  :TESTSUITE/aux-fixed/0123.aliases6
+  0TESTSUITE/aux-fixed/0123.aliases1
+  0TESTSUITE/aux-fixed/0123.aliases6

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   type=lsearch key="z"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
   type=lsearch key="z"


@@ -321,12 +327,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases6
+  closing 0TESTSUITE/aux-fixed/0123.aliases6

 search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases2
-  :TESTSUITE/aux-fixed/0123.aliases1
+  0TESTSUITE/aux-fixed/0123.aliases2
+  0TESTSUITE/aux-fixed/0123.aliases1

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   type=lsearch key="z"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
   type=lsearch key="z"


@@ -344,12 +350,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases1
+  closing 0TESTSUITE/aux-fixed/0123.aliases1

 search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases3
-  :TESTSUITE/aux-fixed/0123.aliases2
+  0TESTSUITE/aux-fixed/0123.aliases3
+  0TESTSUITE/aux-fixed/0123.aliases2

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   type=lsearch key="z"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
   type=lsearch key="z"


@@ -367,12 +373,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases2
+  closing 0TESTSUITE/aux-fixed/0123.aliases2

 search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases4
-  :TESTSUITE/aux-fixed/0123.aliases3
+  0TESTSUITE/aux-fixed/0123.aliases4
+  0TESTSUITE/aux-fixed/0123.aliases3

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   type=lsearch key="z"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
   type=lsearch key="z"


@@ -390,12 +396,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases3
+  closing 0TESTSUITE/aux-fixed/0123.aliases3

 search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases5
-  :TESTSUITE/aux-fixed/0123.aliases4
+  0TESTSUITE/aux-fixed/0123.aliases5
+  0TESTSUITE/aux-fixed/0123.aliases4

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   type=lsearch key="z"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
   type=lsearch key="z"


@@ -413,12 +419,12 @@ rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.al
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
   cached closed
 Too many lookup files open
 search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
   cached closed
 Too many lookup files open

-  closing :TESTSUITE/aux-fixed/0123.aliases4
+  closing 0TESTSUITE/aux-fixed/0123.aliases4

 search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:
 search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   key="z" partial=-1 affix=NULL starflags=0
 LRU list:

-  :TESTSUITE/aux-fixed/0123.aliases6
-  :TESTSUITE/aux-fixed/0123.aliases5
+  0TESTSUITE/aux-fixed/0123.aliases6
+  0TESTSUITE/aux-fixed/0123.aliases5

   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   type=lsearch key="z"
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
   type=lsearch key="z"