[exim-cvs] Testsuite: tidying

Gitweb: http://git.exim.org/exim.git/commitdiff/57cde6e41d1aba216301f33b33f22390fb34967b

Commit:     57cde6e41d1aba216301f33b33f22390fb34967b
Parent:     42ec98804ba4473673997d013f03309dc3e1972d
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Nov 3 15:48:15 2014 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Nov 3 15:48:15 2014 +0000

    Testsuite: tidying
---
 test/aux-fixed/showenv |    4 +++-
 test/src/client.c      |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/aux-fixed/showenv b/test/aux-fixed/showenv
index fc377cc..2d46eef 100755
--- a/test/aux-fixed/showenv
+++ b/test/aux-fixed/showenv
@@ -3,7 +3,9 @@
# This script outputs certain information about the environment, for use when
# testing pipe transports.

-name=`id -un`
+cmd=/usr/xpg4/bin/id
+[ -x $cmd ] || cmd=id
+name=`$cmd -un`

echo Test pipe script
echo Running as: $name
diff --git a/test/src/client.c b/test/src/client.c
index 3f3bbe9..cd2194a 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -256,12 +256,12 @@ int
tls_start(int sock, SSL **ssl, SSL_CTX *ctx)
{
int rc;
-static const unsigned char *sid_ctx = "exim";
+static const unsigned char *sid_ctx = US"exim";

RAND_load_file("client.c", -1); /* Not *very* random! */

*ssl = SSL_new (ctx);
-SSL_set_session_id_context(*ssl, sid_ctx, strlen(sid_ctx));
+SSL_set_session_id_context(*ssl, sid_ctx, strlen(CS sid_ctx));
SSL_set_fd (*ssl, sock);
SSL_set_connect_state(*ssl);