[exim-cvs] Testsuite: change port used for identd test

Gitweb: https://git.exim.org/exim.git/commitdiff/3af060926c5d1c0786a446762c333c91f0665187

Commit:     3af060926c5d1c0786a446762c333c91f0665187
Parent:     24c7087f56530d2d81a92d9955afef13b4f1462f
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Jan 24 19:29:21 2020 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Jan 24 19:29:21 2020 +0000

    Testsuite: change port used for identd test
---
 src/src/exim.c               |  6 +++---
 test/scripts/0000-Basic/0259 | 16 +++++++++-------
 test/stdout/0259             | 14 +++++++-------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/src/exim.c b/src/src/exim.c
index 3be3bf0..d62e923 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -5027,9 +5027,9 @@ if (host_checking)
   if (!sender_ident_set)
     {
     sender_ident = NULL;
-    if (f.running_in_test_harness && sender_host_port != 0 &&
-        interface_address != NULL && interface_port != 0)
-      verify_get_ident(1413);
+    if (f.running_in_test_harness && sender_host_port
+       && interface_address && interface_port)
+      verify_get_ident(1223);        /* note hardwired port number */
     }

/* In case the given address is a non-canonical IPv6 address, canonicalize
diff --git a/test/scripts/0000-Basic/0259 b/test/scripts/0000-Basic/0259
index 211b473..6636ae7 100644
--- a/test/scripts/0000-Basic/0259
+++ b/test/scripts/0000-Basic/0259
@@ -1,7 +1,9 @@
# ident queries
need_ipv4
#
-server 1413
+# The port used for (testing only) identd is hard-coded in exim
+#
+server PORT_N
<999 , 25
>999 , 25 : USERID : UNIX :abcd
****
@@ -10,7 +12,7 @@ helo a.b.c
quit
****
# No CRLF send with output
-server 1413
+server PORT_N
<999 , 25
>>999 , 25 : USERID : UNIX :abcd
****
@@ -19,7 +21,7 @@ helo a.b.c
quit
****
# Non-printing characters
-server 1413
+server PORT_N
<999 , 25
>999 , 25 : USERID : UNIX :ab
cd
****
@@ -28,7 +30,7 @@ helo a.b.c
quit
****
# More than 127 but less than 2K
-server 1413
+server PORT_N
<999 , 25
>999 , 25 : USERID : UNIX :abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++<<<
****
@@ -37,7 +39,7 @@ helo a.b.c
quit
****
# More than 2K
-server 1413
+server PORT_N
<999 , 25
>999 , 25 : USERID : UNIX :abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++
****
@@ -46,7 +48,7 @@ helo a.b.c
quit
****
# Different spacing in the returned identity (1)
-server 1413
+server PORT_N
<999 , 25
>999, 25 : USERID : UNIX :abcd
****
@@ -55,7 +57,7 @@ helo a.b.c
quit
****
# Different spacing in the returned identity (2)
-server 1413
+server PORT_N
<999 , 25
>999,25 : USERID : UNIX :abcd
****
diff --git a/test/stdout/0259 b/test/stdout/0259
index b65d884..fb10a87 100644
--- a/test/stdout/0259
+++ b/test/stdout/0259
@@ -56,37 +56,37 @@
221 myhost.test.ex closing connection

******** SERVER ********
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>999 , 25 : USERID : UNIX :abcd
End of script
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>>999 , 25 : USERID : UNIX :abcd
End of script
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>999 , 25 : USERID : UNIX :ab\x0dcd
End of script
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>999 , 25 : USERID : UNIX :abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++<<<
End of script
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>999 , 25 : USERID : UNIX :abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++
End of script
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>999, 25 : USERID : UNIX :abcd
End of script
-Listening on port 1413 ...
+Listening on port 1223 ...
Connection request from [127.0.0.1]
<999 , 25
>999,25 : USERID : UNIX :abcd