MacOS: fix spurious "child process failure"

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

diff --git a/test/src/client.c b/test/src/client.c
index eef82ef5782be104017762f1a4595d5a4088599c..de36ef0651ee9bae0b524fb217ffaef3d52ef796 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -429,7 +429,7 @@ if (certificate != NULL)
   {
   rc = gnutls_certificate_set_x509_key_file(x509_cred, CS certificate,
     CS privatekey, GNUTLS_X509_FMT_PEM);
-  if (rc < 0) gnutls_error("gnutls_certificate", rc);
+  if (rc < 0) gnutls_error(US"gnutls_certificate", rc);
   }
 
 /* Associate the parameters with the x509 credentials structure. */
@@ -553,32 +553,51 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
   /* Expect incoming */
 
   if (  strncmp(CS outbuffer, "???", 3) == 0
-     && (outbuffer[3] == ' ' || outbuffer[3] == '*')
+     && (outbuffer[3] == ' ' || outbuffer[3] == '*' || outbuffer[3] == '?')
      )
     {
     unsigned char *lineptr;
     unsigned exp_eof = outbuffer[3] == '*';
+    unsigned resp_optional = outbuffer[3] == '?';
 
     printf("%s\n", outbuffer);
     n = unescape_buf(outbuffer, n);
 
+nextinput:
     if (*inptr == 0)   /* Refill input buffer */
       {
+      alarm(timeout);
       if (srv->tls_active)
         {
-        #ifdef HAVE_OPENSSL
-        rc = SSL_read (srv->ssl, inbuffer, bsiz - 1);
-        #endif
-        #ifdef HAVE_GNUTLS
+#ifdef HAVE_OPENSSL
+       int error;
+        rc = SSL_read(srv->ssl, inbuffer, bsiz - 1);
+       if (rc <= 0)
+          switch (error = SSL_get_error(srv->ssl, rc))
+           {
+           case SSL_ERROR_ZERO_RETURN:
+             break;
+           case SSL_ERROR_SYSCALL:
+             printf("%s\n", ERR_error_string(ERR_get_error(), NULL)); break;
+             rc = -1;
+           case SSL_ERROR_SSL:
+             printf("%s\n", ERR_error_string(ERR_get_error(), NULL)); break;
+             SSL_shutdown(srv->ssl);
+             SSL_free(srv->ssl);
+             srv->tls_active = FALSE;
+             goto nextinput;
+           default:
+             printf("SSL error code %d\n", error);
+           }
+
+#endif
+#ifdef HAVE_GNUTLS
         rc = gnutls_record_recv(tls_session, CS inbuffer, bsiz - 1);
-        #endif
+#endif
         }
       else
-        {
-        alarm(timeout);
         rc = read(srv->sock, inbuffer, bsiz);
-        alarm(0);
-        }
+      alarm(0);
 
       if (rc < 0)
        {
@@ -591,6 +610,8 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
           printf("Expected EOF read\n");
          continue;
          }
+       else if (resp_optional)
+         continue;     /* next scriptline */
        else
          {
          printf("Unexpected EOF read\n");
@@ -618,19 +639,31 @@ while (fgets(CS outbuffer, sizeof(outbuffer), f) != NULL)
       if (*inptr == '\n') inptr++;
       }
 
-    printf("<<< %s\n", lineptr);
     if (strncmp(CS lineptr, CS outbuffer + 4, n - 4) != 0)
-      {
-      printf("\n******** Input mismatch ********\n");
-      exit(79);
-      }
+      if (resp_optional)
+       {
+       inptr = lineptr;        /* consume scriptline, not inputline */
+       continue;
+       }
+      else
+       {
+       printf("<<< %s\n", lineptr);
+       printf("\n******** Input mismatch ********\n");
+       exit(79);
+       }
+
+    /* input matched script */
+
+    if (resp_optional)
+      goto nextinput;          /* consume inputline, not scriptline */
+
+    printf("<<< %s\n", lineptr);
 
     #ifdef HAVE_TLS
     if (srv->sent_starttls)
       {
       if (lineptr[0] == '2')
         {
-int rc;
        unsigned int verify;
 
         printf("Attempting to start TLS\n");
@@ -1157,7 +1190,7 @@ SSL_CTX_set_info_callback(srv.ctx, (void (*)())info_callback);
 #ifdef HAVE_GNUTLS
 if (certfile != NULL) printf("Certificate file = %s\n", certfile);
 if (keyfile != NULL) printf("Key file = %s\n", keyfile);
-tls_init(certfile, keyfile);
+tls_init(US certfile, US keyfile);
 tls_session = tls_session_init();
 #ifdef HAVE_OCSP
 if (ocsp_stapling)
@@ -1219,7 +1252,8 @@ do_file(&srv, stdin, timeout, inbuffer, sizeof(inbuffer), inptr);
 
 printf("End of script\n");
 shutdown(srv.sock, SHUT_WR);
-while (read(srv.sock, inbuffer, sizeof(inbuffer)) > 0) ;
+if (fcntl(srv.sock, F_SETFL, O_NONBLOCK) == 0)
+  while (read(srv.sock, inbuffer, sizeof(inbuffer)) > 0) ;
 close(srv.sock);
 
 exit(0);