Testsuite: Avoid requesting TLS cert-status requests from GnuTLS test utility unless...

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

diff --git a/test/src/client.c b/test/src/client.c
index cd2194af126f707f675aeb28283c8c4e040458f1..dd7df5bd69bfed40db6430cf7afbdc6411424905 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -84,6 +84,9 @@ latter needs a whole pile of tables. */
 # if GNUTLS_VERSION_NUMBER >= 0x030103
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
+#  ifndef GNUTLS_NO_EXTENSIONS
+#   define GNUTLS_NO_EXTENSIONS 0
+#  endif
 # endif
 
 # define DH_BITS      768
@@ -451,7 +454,7 @@ tls_session_init(void)
 {
 gnutls_session session;
 
-gnutls_init(&session, GNUTLS_CLIENT);
+gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS);
 
 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);
@@ -480,7 +483,14 @@ return session;
 *************************************************/
 
 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\