From a3558667d8318312591919ec7455ca4935378755 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Sun, 11 Mar 2012 18:08:03 -0400 Subject: [PATCH] Add support for a -notls switch, for consistency's sake. --- man/post.man | 6 +++++- man/send.man | 5 ++++- uip/post.c | 10 ++++++++-- uip/send.c | 3 +++ uip/whatnowsbr.c | 3 +++ uip/whom.c | 3 +++ 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/man/post.man b/man/post.man index f0ab420..460bd81 100644 --- a/man/post.man +++ b/man/post.man @@ -33,6 +33,7 @@ post \- deliver a message .RB [ \-user .IR username ] .RB [ \-tls ] +.RB [ \-notls ] .I file .RB [ \-version ] .RB [ \-help ] @@ -233,7 +234,10 @@ If .B nmh has been compiled with TLS support, the .B \-tls -switch will require the negotiation of TLS support when connecting to the +and +.B \-notls +switches will require and disable the negotiation of TLS support when +connecting to the SMTP MTA. Encrypted data is labelled with `(tls-encrypted)' and `(tls-decrypted)' when viewing the SMTP transction with the .B \-snoop diff --git a/man/send.man b/man/send.man index a25c63b..faf4d08 100644 --- a/man/send.man +++ b/man/send.man @@ -42,6 +42,7 @@ send \- send a message .RB [ \-user .IR username ] .RB [ \-tls ] +.RB [ \-notls ] .RB [ \-width .IR columns ] .RB [ file @@ -374,7 +375,9 @@ If .B nmh has been compiled with TLS support, the .B \-tls -switch will require the negotiation of TLS support when connecting to the +and +.B \-notls +switches will require and disable the negotiation of TLS support when connecting to the SMTP MTA. Encrypted data is labelled with `(tls-encrypted)' and `(tls-decrypted)' when viewing the SMTP transction with the .B \-snoop diff --git a/uip/post.c b/uip/post.c index b24f571..83e008d 100644 --- a/uip/post.c +++ b/uip/post.c @@ -127,9 +127,11 @@ static struct swit switches[] = { { "port server port name/number", 4 }, #define TLSSW 36 { "tls", TLSminc(-3) }, -#define FILEPROCSW 37 +#define NTLSSW 37 + { "notls", TLSminc(-5) }, +#define FILEPROCSW 38 { "fileproc", -4 }, -#define MHLPROCSW 38 +#define MHLPROCSW 39 { "mhlproc", -3 }, { NULL, 0 } }; @@ -494,6 +496,10 @@ main (int argc, char **argv) tls++; continue; + case NTLSSW: + tls = 0; + continue; + case FILEPROCSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); diff --git a/uip/send.c b/uip/send.c index 9e804bc..9df71d7 100644 --- a/uip/send.c +++ b/uip/send.c @@ -118,6 +118,8 @@ static struct swit switches[] = { { "port server-port-name/number" , 4 }, #define TLSSW 45 { "tls", TLSminc(-3) }, +#define NTLSSW 46 + { "notls", TLSminc(-5) }, { NULL, 0 } }; @@ -284,6 +286,7 @@ main (int argc, char **argv) case SASLSW: case NOSASLSW: case TLSSW: + case NTLSSW: vec[vecp++] = --cp; continue; diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index ac9dc3a..58099f0 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -1070,6 +1070,8 @@ static struct swit sendswitches[] = { { "port server-port-name/number", 4 }, #define TLSSW 44 { "tls", TLSminc(-3) }, +#define NTLSSW 45 + { "notls", TLSminc(-5) }, { NULL, 0 } }; @@ -1233,6 +1235,7 @@ sendit (char *sp, char **arg, char *file, int pushed) case SASLSW: case NOSASLSW: case TLSSW: + case NTLSSW: vec[vecp++] = --cp; continue; diff --git a/uip/whom.c b/uip/whom.c index 33a6d97..24f09ef 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -58,6 +58,8 @@ static struct swit switches[] = { { "port server port name/number", 4 }, #define TLSSW 16 { "tls", TLSminc(-3) }, +#define NTLSSW 17 + { "notls", TLSminc(-5) }, { NULL, 0 } }; @@ -113,6 +115,7 @@ main (int argc, char **argv) case SNOOPSW: case SASLSW: case TLSSW: + case NTLSSW: vec[vecp++] = --cp; continue; -- 1.7.10.4