*** empty log message ***

diff --git a/src/cli-gaa.c b/src/cli-gaa.c
index 4c11b5df685c0d3401a1758af6f136362c6dbcb8..225e597a438347718a82b8f0604373585eaf59d3 100644 (file)
--- a/src/cli-gaa.c
+++ b/src/cli-gaa.c
@@ -129,7 +129,7 @@ void gaa_help(void)
        printf("GNU TLS test client\nUsage:  gnutls-cli [options] hostname\n\n\n");
        __gaa_helpsingle('d', "debug", "integer ", "Enable debugging");
        __gaa_helpsingle('r', "resume", "", "Connect, establish a session. Connect again and resume this session.");
-       __gaa_helpsingle('s', "starttls", "", "Connect, establish a plain session and start TLS when EOF is sent from the keyboard.");
+       __gaa_helpsingle('s', "starttls", "", "Connect, establish a plain session and start TLS when EOF or a SIGALRM is received.");
        __gaa_helpsingle(0, "crlf", "", "Send CR LF instead of LF.");
        __gaa_helpsingle(0, "x509fmtder", "", "Use DER format for certificates to read from.");
        __gaa_helpsingle('f', "fingerprint", "", "Send the openpgp fingerprint, instead of the key.");

diff --git a/src/cli.gaa b/src/cli.gaa
index 86c4323247d178e41ecc75bde27bcec40a10f81b..da853449bd9f158d1fa8428079aa20b983f660b2 100644 (file)
--- a/src/cli.gaa
+++ b/src/cli.gaa
@@ -18,7 +18,7 @@ option (d, debug) INT "integer" { $debug = $1 } "Enable debugging"
 option (r, resume) { $resume = 1 } "Connect, establish a session. Connect again and resume this session."
 
 #int starttls;
-option (s, starttls) { $starttls = 1 } "Connect, establish a plain session and start TLS when EOF is sent from the keyboard."
+option (s, starttls) { $starttls = 1 } "Connect, establish a plain session and start TLS when EOF or a SIGALRM is received."
 
 #int crlf;
 option (crlf) { $crlf = 1 } "Send CR LF instead of LF."