Testsuite: re-insert munge expression about size/inode

[exim.git] / test / src / client.c

diff --git a/test/src/client.c b/test/src/client.c
index e7210f22398ac15252efbde89b3d85078f0a6eec..fe646d64f7f35efe75a93d16f649a96dace84814 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -58,7 +58,6 @@ static int sigalrm_seen = 0;
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */

-

 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>
 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>


@@ -67,7 +66,14 @@ latter needs a whole pile of tables. */
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>

-# include <openssl/ocsp.h>
+
+# if OPENSSL_VERSION_NUMBER < 0x0090806fL && !defined(DISABLE_OCSP) && !defined(OPENSSL_NO_TLSEXT)
+#  warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile"
+#  define DISABLE_OCSP
+# endif
+# ifndef DISABLE_OCSP
+#  include <openssl/ocsp.h>
+# endif

 #endif
 
 
 #endif
 
 


@@ -79,20 +85,24 @@ latter needs a whole pile of tables. */
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
 # endif
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
 # endif

+# ifndef GNUTLS_NO_EXTENSIONS
+#  define GNUTLS_NO_EXTENSIONS 0
+# endif

 
 # define DH_BITS      768
 
 /* Local static variables for GNUTLS */
 
 
 # define DH_BITS      768
 
 /* Local static variables for GNUTLS */
 

-static gnutls_dh_params dh_params = NULL;
+static gnutls_dh_params_t dh_params = NULL;

 
 static gnutls_certificate_credentials_t x509_cred = NULL;
 
 static gnutls_certificate_credentials_t x509_cred = NULL;

-static gnutls_session tls_session = NULL;
+static gnutls_session_t tls_session = NULL;

 
 static int  ssl_session_timeout = 200;
 
 /* Priorities for TLS algorithms to use. */
 
 
 static int  ssl_session_timeout = 200;
 
 /* Priorities for TLS algorithms to use. */
 

+#if GNUTLS_VERSION_NUMBER < 0x030400

 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
 
 static const int kx_priority[16] = {
 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
 
 static const int kx_priority[16] = {


@@ -114,7 +124,7 @@ static const int mac_priority[16] = {
   0 };
 
 static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
   0 };
 
 static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };

-static const int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 };
+#endif

 
 #endif /*HAVE_GNUTLS*/
 
 
 #endif /*HAVE_GNUTLS*/
 


@@ -188,6 +198,7 @@ setup_verify(BIO *bp, char *CAfile, char *CApath)
 }
 
 
 }
 
 

+#ifndef DISABLE_OCSP

 static int
 tls_client_stapling_cb(SSL *s, void *arg)
 {
 static int
 tls_client_stapling_cb(SSL *s, void *arg)
 {


@@ -238,6 +249,7 @@ else
 X509_STORE_free(store);
 return ret;
 }
 X509_STORE_free(store);
 return ret;
 }

+#endif

 
 
 /*************************************************
 
 
 /*************************************************


@@ -248,21 +260,23 @@ int
 tls_start(int sock, SSL **ssl, SSL_CTX *ctx)
 {
 int rc;
 tls_start(int sock, SSL **ssl, SSL_CTX *ctx)
 {
 int rc;

-static const 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);
 
 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);
 
 SSL_set_fd (*ssl, sock);
 SSL_set_connect_state(*ssl);
 

+#ifndef DISABLE_OCSP

 if (ocsp_stapling)
   {
   SSL_CTX_set_tlsext_status_cb(ctx, tls_client_stapling_cb);
   SSL_CTX_set_tlsext_status_arg(ctx, BIO_new_fp(stdout, BIO_NOCLOSE));
   SSL_set_tlsext_status_type(*ssl, TLSEXT_STATUSTYPE_ocsp);
   }
 if (ocsp_stapling)
   {
   SSL_CTX_set_tlsext_status_cb(ctx, tls_client_stapling_cb);
   SSL_CTX_set_tlsext_status_arg(ctx, BIO_new_fp(stdout, BIO_NOCLOSE));
   SSL_set_tlsext_status_type(*ssl, TLSEXT_STATUSTYPE_ocsp);
   }

+#endif

 
 signal(SIGALRM, sigalrm_handler_flag);
 sigalrm_seen = 0;
 
 signal(SIGALRM, sigalrm_handler_flag);
 sigalrm_seen = 0;


@@ -326,7 +340,7 @@ gnutls_error(uschar *prefix, int err)
 fprintf(stderr, "GnuTLS connection error: %s:", prefix);
 if (err != 0) fprintf(stderr, " %s", gnutls_strerror(err));
 fprintf(stderr, "\n");
 fprintf(stderr, "GnuTLS connection error: %s:", prefix);
 if (err != 0) fprintf(stderr, " %s", gnutls_strerror(err));
 fprintf(stderr, "\n");

-exit(1);
+exit(98);

 }
 
 
 }
 
 


@@ -343,7 +357,7 @@ init_dh(void)
 {
 int fd;
 int ret;
 {
 int fd;
 int ret;

-gnutls_datum m;
+gnutls_datum_t m;

 uschar filename[200];
 struct stat statbuf;
 
 uschar filename[200];
 struct stat statbuf;
 


@@ -359,7 +373,7 @@ fd = open("aux-fixed/gnutls-params", O_RDONLY, 0);
 if (fd < 0)
   {
   fprintf(stderr, "Failed to open spool/gnutls-params: %s\n", strerror(errno));
 if (fd < 0)
   {
   fprintf(stderr, "Failed to open spool/gnutls-params: %s\n", strerror(errno));

-  exit(1);
+  exit(97);

   }
 
 if (fstat(fd, &statbuf) < 0)
   }
 
 if (fstat(fd, &statbuf) < 0)


@@ -436,13 +450,14 @@ if (ocsp_stapling)
 *        Initialize a single GNUTLS session      *
 *************************************************/
 
 *        Initialize a single GNUTLS session      *
 *************************************************/
 

-static gnutls_session
+static gnutls_session_t

 tls_session_init(void)
 {
 tls_session_init(void)
 {

-gnutls_session session;
+gnutls_session_t session;

 
 

-gnutls_init(&session, GNUTLS_CLIENT);
+gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS);

 
 

+#if GNUTLS_VERSION_NUMBER < 0x030400

 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);
 gnutls_kx_set_priority(session, kx_priority);
 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);
 gnutls_kx_set_priority(session, kx_priority);


@@ -450,6 +465,10 @@ gnutls_protocol_set_priority(session, protocol_priority);
 gnutls_mac_set_priority(session, mac_priority);
 
 gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 gnutls_mac_set_priority(session, mac_priority);
 
 gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);

+#else
+gnutls_set_default_priority(session);
+gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
+#endif

 
 gnutls_dh_set_prime_bits(session, DH_BITS);
 gnutls_db_set_cache_expiration(session, ssl_session_timeout);
 
 gnutls_dh_set_prime_bits(session, DH_BITS);
 gnutls_db_set_cache_expiration(session, ssl_session_timeout);


@@ -470,7 +489,14 @@ return session;
 *************************************************/
 
 const char * const HELP_MESSAGE = "\n\
 *************************************************/
 
 const char * const HELP_MESSAGE = "\n\

-Usage: client\n\
+Usage: client\n"
+#ifdef HAVE_TLS
+"\
+          [-tls-on-connect]\n\
+          [-ocsp]\n"
+#endif
+"\
+          [-tn] n seconds timeout\n\

           <IP address>\n\
           <port>\n\
           [<outgoing interface>]\n\
           <IP address>\n\
           <port>\n\
           [<outgoing interface>]\n\


@@ -489,7 +515,7 @@ char *keyfile = NULL;
 char *end = NULL;
 int argi = 1;
 int host_af, port, s_len, rc, sock, save_errno;
 char *end = NULL;
 int argi = 1;
 int host_af, port, s_len, rc, sock, save_errno;

-int timeout = 1;
+int timeout = 5;

 int tls_active = 0;
 int sent_starttls = 0;
 int tls_on_connect = 0;
 int tls_active = 0;
 int sent_starttls = 0;
 int tls_on_connect = 0;


@@ -518,7 +544,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
       strcmp(argv[argi], "--help") == 0 ||
       strcmp(argv[argi], "-h") == 0)
     {
       strcmp(argv[argi], "--help") == 0 ||
       strcmp(argv[argi], "-h") == 0)
     {

-    printf(HELP_MESSAGE);
+    puts(HELP_MESSAGE);

     exit(0);
     }
   if (strcmp(argv[argi], "-tls-on-connect") == 0)
     exit(0);
     }
   if (strcmp(argv[argi], "-tls-on-connect") == 0)


@@ -532,7 +558,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
     if (argc < ++argi + 1)
       {
       fprintf(stderr, "Missing required certificate file for ocsp option\n");
     if (argc < ++argi + 1)
       {
       fprintf(stderr, "Missing required certificate file for ocsp option\n");

-      exit(1);
+      exit(96);

       }
     ocsp_stapling = argv[argi++];
     }
       }
     ocsp_stapling = argv[argi++];
     }


@@ -545,18 +571,18 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
       {
       fprintf(stderr, "Failed to parse seconds from option <%s>\n",
         argv[argi]);
       {
       fprintf(stderr, "Failed to parse seconds from option <%s>\n",
         argv[argi]);

-      exit(1);
+      exit(95);

       }
     if (tmplong > 10000L)
       {
       }
     if (tmplong > 10000L)
       {

-      fprintf(stderr, "Unreasonably long wait of %d seconds requested\n",
+      fprintf(stderr, "Unreasonably long wait of %ld seconds requested\n",

         tmplong);
         tmplong);

-      exit(1);
+      exit(94);

       }
     if (tmplong < 0L)
       {
       }
     if (tmplong < 0L)
       {

-      fprintf(stderr, "Timeout must not be negative (%d)\n", tmplong);
-      exit(1);
+      fprintf(stderr, "Timeout must not be negative (%ld)\n", tmplong);
+      exit(93);

       }
     timeout = (int) tmplong;
     argi++;
       }
     timeout = (int) tmplong;
     argi++;


@@ -564,7 +590,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
   else
     {
     fprintf(stderr, "Unrecognized option %s\n", argv[argi]);
   else
     {
     fprintf(stderr, "Unrecognized option %s\n", argv[argi]);

-    exit(1);
+    exit(92);

     }
   }
 
     }
   }
 


@@ -573,7 +599,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
 if (argc < argi+1)
   {
   fprintf(stderr, "No IP address given\n");
 if (argc < argi+1)
   {
   fprintf(stderr, "No IP address given\n");

-  exit(1);
+  exit(91);

   }
 
 address = argv[argi++];
   }
 
 address = argv[argi++];


@@ -584,7 +610,7 @@ host_af = (strchr(address, ':') != NULL)? AF_INET6 : AF_INET;
 if (argc < argi+1)
   {
   fprintf(stderr, "No port number given\n");
 if (argc < argi+1)
   {
   fprintf(stderr, "No port number given\n");

-  exit(1);
+  exit(90);

   }
 
 port = atoi(argv[argi++]);
   }
 
 port = atoi(argv[argi++]);


@@ -626,7 +652,7 @@ sock = socket(host_af, SOCK_STREAM, 0);
 if (sock < 0)
   {
   printf("socket creation failed: %s\n", strerror(errno));
 if (sock < 0)
   {
   printf("socket creation failed: %s\n", strerror(errno));

-  exit(1);
+  exit(89);

   }
 
 /* Bind to a specific interface if requested. On an IPv6 system, this has
   }
 
 /* Bind to a specific interface if requested. On an IPv6 system, this has


@@ -651,7 +677,7 @@ if (interface != NULL)
       if (inet_pton(AF_INET6, interface, &s_in6.sin6_addr) != 1)
         {
         printf("Unable to parse \"%s\"", interface);
       if (inet_pton(AF_INET6, interface, &s_in6.sin6_addr) != 1)
         {
         printf("Unable to parse \"%s\"", interface);

-        exit(1);
+        exit(88);

         }
       }
     else
         }
       }
     else


@@ -672,7 +698,7 @@ if (interface != NULL)
       {
       printf("Unable to bind outgoing SMTP call to %s: %s",
         interface, strerror(errno));
       {
       printf("Unable to bind outgoing SMTP call to %s: %s",
         interface, strerror(errno));

-      exit(1);
+      exit(87);

       }
     }
   }
       }
     }
   }


@@ -688,7 +714,7 @@ if (host_af == AF_INET6)
   if (inet_pton(host_af, address, &s_in6.sin6_addr) != 1)
     {
     printf("Unable to parse \"%s\"", address);
   if (inet_pton(host_af, address, &s_in6.sin6_addr) != 1)
     {
     printf("Unable to parse \"%s\"", address);

-    exit(1);
+    exit(86);

     }
   }
 else
     }
   }
 else


@@ -717,8 +743,8 @@ an externally applied timeout if the signal handler has been run. */
 if (rc < 0)
   {
   close(sock);
 if (rc < 0)
   {
   close(sock);

-  printf("failed: %s\n", strerror(save_errno));
-  exit(1);
+  printf("connect failed: %s\n", strerror(save_errno));
+  exit(85);

   }
 
 printf("connected\n");
   }
 
 printf("connected\n");


@@ -734,7 +760,7 @@ ctx = SSL_CTX_new(SSLv23_method());
 if (ctx == NULL)
   {
   printf ("SSL_CTX_new failed\n");
 if (ctx == NULL)
   {
   printf ("SSL_CTX_new failed\n");

-  exit(1);
+  exit(84);

   }
 
 if (certfile != NULL)
   }
 
 if (certfile != NULL)


@@ -742,7 +768,7 @@ if (certfile != NULL)
   if (!SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
     {
     printf("SSL_CTX_use_certificate_file failed\n");
   if (!SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM))
     {
     printf("SSL_CTX_use_certificate_file failed\n");

-    exit(1);
+    exit(83);

     }
   printf("Certificate file = %s\n", certfile);
   }
     }
   printf("Certificate file = %s\n", certfile);
   }


@@ -752,7 +778,7 @@ if (keyfile != NULL)
   if (!SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))
     {
     printf("SSL_CTX_use_PrivateKey_file failed\n");
   if (!SSL_CTX_use_PrivateKey_file(ctx, keyfile, SSL_FILETYPE_PEM))
     {
     printf("SSL_CTX_use_PrivateKey_file failed\n");

-    exit(1);
+    exit(82);

     }
   printf("Key file = %s\n", keyfile);
   }
     }
   printf("Key file = %s\n", keyfile);
   }


@@ -774,7 +800,7 @@ tls_session = tls_session_init();
 if (ocsp_stapling)
   gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL);
 #endif
 if (ocsp_stapling)
   gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL);
 #endif

-gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr)sock);
+gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr_t)(intptr_t)sock);

 
 /* When the server asks for a certificate and the client does not have one,
 there is a SIGPIPE error in the gnutls_handshake() function for some reason
 
 /* When the server asks for a certificate and the client does not have one,
 there is a SIGPIPE error in the gnutls_handshake() function for some reason


@@ -795,38 +821,47 @@ if (tls_on_connect)
   {
   printf("Attempting to start TLS\n");
 
   {
   printf("Attempting to start TLS\n");
 

-  #ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL

   tls_active = tls_start(sock, &ssl, ctx);
   tls_active = tls_start(sock, &ssl, ctx);

-  #endif
+#endif

 
 

-  #ifdef HAVE_GNUTLS
+#ifdef HAVE_GNUTLS
+  {
+  int rc;

   sigalrm_seen = FALSE;
   alarm(timeout);
   sigalrm_seen = FALSE;
   alarm(timeout);

-  tls_active = gnutls_handshake(tls_session) >= 0;
+  do {
+    rc = gnutls_handshake(tls_session);
+  } while (rc < 0 && gnutls_error_is_fatal(rc) == 0);
+  tls_active = rc >= 0;

   alarm(0);
   alarm(0);

-  #endif
+
+  if (!tls_active) printf("%s\n", gnutls_strerror(rc));
+  }
+#endif

 
   if (!tls_active)
     printf("Failed to start TLS\n");
 
   if (!tls_active)
     printf("Failed to start TLS\n");

-  #if defined(HAVE_GNUTLS) && defined(HAVE_OCSP)
+#if defined(HAVE_GNUTLS) && defined(HAVE_OCSP)

   else if (  ocsp_stapling
          && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
     printf("Failed to verify certificate status\n");
   else if (  ocsp_stapling
          && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0)
     printf("Failed to verify certificate status\n");

-  #endif
+#endif

   else
     printf("Succeeded in starting TLS\n");
   }
 #endif
 
   else
     printf("Succeeded in starting TLS\n");
   }
 #endif
 

-while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL)
+while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL)

   {
   {

-  int n = (int)strlen(outbuffer);
-  while (n > 0 && isspace(outbuffer[n-1])) n--;
-  outbuffer[n] = 0;
+  int n = (int)strlen(CS outbuffer);
+
+  /* Strip trailing newline */
+  if (outbuffer[n-1] == '\n') outbuffer[--n] = 0;

 
   /* Expect incoming */
 
 
   /* Expect incoming */
 

-  if (strncmp(outbuffer, "??? ", 4) == 0)
+  if (strncmp(CS outbuffer, "??? ", 4) == 0)

     {
     unsigned char *lineptr;
     printf("%s\n", outbuffer);
     {
     unsigned char *lineptr;
     printf("%s\n", outbuffer);


@@ -852,13 +887,13 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL)
       if (rc < 0)
         {
         printf("Read error %s\n", strerror(errno));
       if (rc < 0)
         {
         printf("Read error %s\n", strerror(errno));

-        exit(1)  ;
+        exit(81)  ;

         }
       else if (rc == 0)
         {
         printf("Unexpected EOF read\n");
         close(sock);
         }
       else if (rc == 0)
         {
         printf("Unexpected EOF read\n");
         close(sock);

-        exit(1);
+        exit(80);

         }
       else
         {
         }
       else
         {


@@ -876,10 +911,10 @@ while (fgets(outbuffer, sizeof(outbuffer), stdin) != NULL)
       }
 
     printf("<<< %s\n", lineptr);
       }
 
     printf("<<< %s\n", lineptr);

-    if (strncmp(lineptr, outbuffer + 4, (int)strlen(outbuffer) - 4) != 0)
+    if (strncmp(CS lineptr, CS outbuffer + 4, (int)strlen(CS outbuffer) - 4) != 0)

       {
       printf("\n******** Input mismatch ********\n");
       {
       printf("\n******** Input mismatch ********\n");

-      exit(1);
+      exit(79);

       }
 
     #ifdef HAVE_TLS
       }
 
     #ifdef HAVE_TLS


@@ -898,10 +933,18 @@ int rc;
         #endif
 
         #ifdef HAVE_GNUTLS
         #endif
 
         #ifdef HAVE_GNUTLS

-        sigalrm_seen = FALSE;
-        alarm(timeout);
-        tls_active = gnutls_handshake(tls_session) >= 0;
-        alarm(0);
+         {
+         int rc;
+         sigalrm_seen = FALSE;
+         alarm(timeout);
+         do {
+           rc = gnutls_handshake(tls_session);
+         } while (rc < 0 && gnutls_error_is_fatal(rc) == 0);
+         tls_active = rc >= 0;
+         alarm(0);
+
+         if (!tls_active) printf("%s\n", gnutls_strerror(rc));
+         }

         #endif
 
         if (!tls_active)
         #endif
 
         if (!tls_active)


@@ -958,10 +1001,10 @@ int rc;
 
   /* Wait for a bit before proceeding */
 
 
   /* Wait for a bit before proceeding */
 

-  else if (strncmp(outbuffer, "+++ ", 4) == 0)
+  else if (strncmp(CS outbuffer, "+++ ", 4) == 0)

     {
     printf("%s\n", outbuffer);
     {
     printf("%s\n", outbuffer);

-    sleep(atoi(outbuffer + 4));
+    sleep(atoi(CS outbuffer + 4));

     }
 
   /* Send outgoing, but barf if unconsumed incoming */
     }
 
   /* Send outgoing, but barf if unconsumed incoming */


@@ -974,20 +1017,20 @@ int rc;
       {
       printf("Unconsumed input: %s", inptr);
       printf("   About to send: %s\n", outbuffer);
       {
       printf("Unconsumed input: %s", inptr);
       printf("   About to send: %s\n", outbuffer);

-      exit(1);
+      exit(78);

       }
 
     #ifdef HAVE_TLS
 
     /* Shutdown TLS */
 
       }
 
     #ifdef HAVE_TLS
 
     /* Shutdown TLS */
 

-    if (strcmp(outbuffer, "stoptls") == 0 ||
-        strcmp(outbuffer, "STOPTLS") == 0)
+    if (strcmp(CS outbuffer, "stoptls") == 0 ||
+        strcmp(CS outbuffer, "STOPTLS") == 0)

       {
       if (!tls_active)
         {
         printf("STOPTLS read when TLS not active\n");
       {
       if (!tls_active)
         {
         printf("STOPTLS read when TLS not active\n");

-        exit(1);
+        exit(77);

         }
       printf("Shutting down TLS encryption\n");
 
         }
       printf("Shutting down TLS encryption\n");
 


@@ -1009,14 +1052,14 @@ int rc;
 
     /* Remember that we sent STARTTLS */
 
 
     /* Remember that we sent STARTTLS */
 

-    sent_starttls = (strcmp(outbuffer, "starttls") == 0 ||
-                     strcmp(outbuffer, "STARTTLS") == 0);
+    sent_starttls = (strcmp(CS outbuffer, "starttls") == 0 ||
+                     strcmp(CS outbuffer, "STARTTLS") == 0);

 
     /* Fudge: if the command is "starttls_wait", we send the starttls bit,
     but we haven't set the flag, so that there is no negotiation. This is for
     testing the server's timeout. */
 
 
     /* Fudge: if the command is "starttls_wait", we send the starttls bit,
     but we haven't set the flag, so that there is no negotiation. This is for
     testing the server's timeout. */
 

-    if (strcmp(outbuffer, "starttls_wait") == 0)
+    if (strcmp(CS outbuffer, "starttls_wait") == 0)

       {
       outbuffer[8] = 0;
       n = 8;
       {
       outbuffer[8] = 0;
       n = 8;


@@ -1024,18 +1067,18 @@ int rc;
     #endif
 
     printf(">>> %s\n", outbuffer);
     #endif
 
     printf(">>> %s\n", outbuffer);

-    strcpy(outbuffer + n, "\r\n");
+    strcpy(CS outbuffer + n, "\r\n");

 
     /* Turn "\n" and "\r" into the relevant characters. This is a hack. */
 
 
     /* Turn "\n" and "\r" into the relevant characters. This is a hack. */
 

-    while ((escape = strstr(outbuffer, "\\r")) != NULL)
+    while ((escape = US strstr(CS outbuffer, "\\r")) != NULL)

       {
       *escape = '\r';
       memmove(escape + 1, escape + 2,  (n + 2) - (escape - outbuffer) - 2);
       n--;
       }
 
       {
       *escape = '\r';
       memmove(escape + 1, escape + 2,  (n + 2) - (escape - outbuffer) - 2);
       n--;
       }
 

-    while ((escape = strstr(outbuffer, "\\n")) != NULL)
+    while ((escape = US strstr(CS outbuffer, "\\n")) != NULL)

       {
       *escape = '\n';
       memmove(escape + 1, escape + 2,  (n + 2) - (escape - outbuffer) - 2);
       {
       *escape = '\n';
       memmove(escape + 1, escape + 2,  (n + 2) - (escape - outbuffer) - 2);


@@ -1055,7 +1098,7 @@ int rc;
         if (rc < 0)
           {
           printf("GnuTLS write error: %s\n", gnutls_strerror(rc));
         if (rc < 0)
           {
           printf("GnuTLS write error: %s\n", gnutls_strerror(rc));

-          exit(1);
+          exit(76);

           }
       #endif
       }
           }
       #endif
       }


@@ -1068,12 +1111,14 @@ int rc;
     if (rc < 0)
       {
       printf("Write error: %s\n", strerror(errno));
     if (rc < 0)
       {
       printf("Write error: %s\n", strerror(errno));

-      exit(1);
+      exit(75);

       }
     }
   }
 
 printf("End of script\n");
       }
     }
   }
 
 printf("End of script\n");

+shutdown(sock, SHUT_WR);
+while ((rc = read(sock, inbuffer, sizeof(inbuffer))) > 0) ;

 close(sock);
 
 exit(0);
 close(sock);
 
 exit(0);