From 156d35f6425bea4c1ed3c4c79783dc613379c65b Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Tue, 4 Oct 2011 18:53:49 +0200 Subject: [PATCH] Removed SASL support. We don't need it anymore because we talk SMTP no more --- configure.in | 26 -------------------------- man/mh-chart.man | 10 ---------- man/post.man | 30 ------------------------------ man/send.man | 30 ------------------------------ uip/send.c | 15 --------------- uip/whatnowsbr.c | 15 --------------- uip/whom.c | 15 --------------- 7 files changed, 141 deletions(-) diff --git a/configure.in b/configure.in index 6a4dfff..29c0bc9 100644 --- a/configure.in +++ b/configure.in @@ -78,22 +78,6 @@ fi], AC_DEFINE(LOCALE) ) -dnl Do you want client-side support for using SASL for authentication? -dnl Note that this code will be enabled for SMTP -AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl], - [Enable SASL support via the Cyrus SASL library])) -if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then - AC_DEFINE(CYRUS_SASL, 1, - [Define to use the Cyrus SASL library for authentication of SMTP.])dnl - if test x"$with_cyrus_sasl" != xyes; then - AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored]) - AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS]) - fi - sasl_support=yes -else - sasl_support=no -fi - dnl Do you want client-side support for encryption with TLS? AC_ARG_WITH(tls, AS_HELP_STRING([--with-tls], [Enable TLS support])) if test x"$with_tls" != x -a x"$with_tls" != x"no"; then @@ -612,15 +596,6 @@ else fi -dnl -------------------- -dnl CHECK FOR CYRUS-SASL -dnl -------------------- - -AS_IF([test x"$sasl_support" = x"yes"],[ - AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])]) - AC_CHECK_LIB([sasl2], [sasl_client_new], , - [AC_MSG_ERROR([Cyrus SASL library not found])])]) - dnl ----------------- dnl CHECK FOR OPENSSL dnl ----------------- @@ -949,6 +924,5 @@ file locking type : ${LOCKTYPE} default editor : ${editorpath} default pager : ${pagerpath} email address masquerading : ${masquerade} -SASL support : ${sasl_support} TLS support : ${tls_support}" echo "" diff --git a/man/mh-chart.man b/man/mh-chart.man index c27b8d3..603e34a 100644 --- a/man/mh-chart.man +++ b/man/mh-chart.man @@ -519,11 +519,6 @@ or .RB [ \-watch " | " \-nowatch ] .RB [ \-width .IR columns ] -.RB [ \-sasl ] -.RB [ \-saslmech -.IR mechanism ] -.RB [ \-user -.IR username ] .I file .RB [ \-tls ] .RB [ \-version ] @@ -705,11 +700,6 @@ all/to/cc/me] .IR seconds ] .RB [ \-verbose " | " \-noverbose ] .RB [ \-watch " | " \-nowatch ] -.RB [ \-sasl ] -.RB [ \-saslmech -.IR mechanism ] -.RB [ \-user -.IR username ] .RB [ \-tls ] .RB [ \-width .IR columns ] diff --git a/man/post.man b/man/post.man index 0f62631..85edbc4 100644 --- a/man/post.man +++ b/man/post.man @@ -20,11 +20,6 @@ post \- deliver a message .RB [ \-watch " | " \-nowatch ] .RB [ \-width .IR columns ] -.RB [ \-sasl ] -.RB [ \-saslmech -.IR mechanism ] -.RB [ \-user -.IR username ] .I file .RB [ \-version ] .RB [ \-help ] @@ -189,31 +184,6 @@ entry in .PP If .B nmh -has been compiled with SASL support, the -.B \-sasl -switch will enable -the use of SASL authentication with the SMTP MTA. Depending on the -SASL mechanism used, this may require an additional password prompt from the -user (but the -.RI \*(lq \&.netrc \*(rq -file can be used to store this password). -.B \-saslmech -switch can be used to select a particular SASL mechanism, -and the the -.B \-user -switch can be used to select a authorization userid -to provide to SASL other than the default. -.PP -If SASL authentication is successful, -.BR nmh -will attempt to negotiate a security layer for session encryption. -Encrypted data is labelled with `(sasl-encrypted)' and `(sasl-decrypted)' when -viewing the SMTP transaction with the -.B \-snoop -switch. -.PP -If -.B nmh has been compiled with TLS support, the .B \-tls switch will require the negotiation of TLS support when connecting to the diff --git a/man/send.man b/man/send.man index e75583e..e18ed20 100644 --- a/man/send.man +++ b/man/send.man @@ -32,11 +32,6 @@ send \- send a message .IR servername ] .RB [ \-port .IR port-name/number ] -.RB [ \-sasl ] -.RB [ \-saslmech -.IR mechanism ] -.RB [ \-user -.IR username ] .RB [ \-width .IR columns ] .RB [ file @@ -330,31 +325,6 @@ entry in .PP If .B nmh -has been compiled with SASL support, the -.B \-sasl -switch will enable -the use of SASL authentication with the SMTP MTA. Depending on the -SASL mechanism used, this may require an additional password prompt from the -user (but the -.RI \*(lq \&.netrc \*(rq -file can be used to store this password). -.B \-saslmech -switch can be used to select a particular SASL mechanism, -and the the -.B \-user -switch can be used to select a authorization userid -to provide to SASL other than the default. -.PP -If SASL authentication is successful, -.BR nmh -will attempt to negotiate a security layer for session encryption. -Encrypted data is labelled with `(encrypted)' and `(decrypted)' when -viewing the SMTP transaction with the -.B \-snoop -switch. -.PP -If -.B nmh has been compiled with TLS support, the .B \-tls switch will require the negotiation of TLS support when connecting to the diff --git a/uip/send.c b/uip/send.c index d06b6c4..a97bab8 100644 --- a/uip/send.c +++ b/uip/send.c @@ -13,12 +13,6 @@ #include -#ifndef CYRUS_SASL -# define SASLminc(a) (a) -#else /* CYRUS_SASL */ -# define SASLminc(a) 0 -#endif /* CYRUS_SASL */ - #ifndef TLS_SUPPORT # define TLSminc(a) (a) #else /* TLS_SUPPORT */ @@ -100,12 +94,6 @@ static struct swit switches[] = { { "server host", 6 }, #define SNOOPSW 36 { "snoop", 5 }, -#define SASLSW 37 - { "sasl", SASLminc(4) }, -#define SASLMECHSW 38 - { "saslmech mechanism", SASLminc(-5) }, -#define USERSW 39 - { "user username", SASLminc(-4) }, #define ATTACHSW 40 { "attach", 6 }, #define ATTACHFORMATSW 41 @@ -270,7 +258,6 @@ main (int argc, char **argv) case SENDSW: case SOMLSW: case SNOOPSW: - case SASLSW: case TLSSW: vec[vecp++] = --cp; continue; @@ -280,8 +267,6 @@ main (int argc, char **argv) case WIDTHSW: case CLIESW: case SERVSW: - case SASLMECHSW: - case USERSW: case PORTSW: vec[vecp++] = --cp; if (!(cp = *argp++) || *cp == '-') diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 6541b42..cb48bfd 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -977,12 +977,6 @@ check_draft (char *msgnam) } -#ifndef CYRUS_SASL -# define SASLminc(a) (a) -#else /* CYRUS_SASL */ -# define SASLminc(a) 0 -#endif /* CYRUS_SASL */ - #ifndef TLS_SUPPORT # define TLSminc(a) (a) #else /* TLS_SUPPORT */ @@ -1062,12 +1056,6 @@ static struct swit sendswitches[] = { { "draftmessage msg", -6 }, #define SNDRFSW 35 { "nodraftfolder", -3 }, -#define SASLSW 36 - { "sasl", SASLminc(-4) }, -#define SASLMECHSW 37 - { "saslmech", SASLminc(-5) }, -#define USERSW 38 - { "user", SASLminc(-4) }, #define SNDATTACHSW 39 { "attach file", 6 }, #define SNDATTACHFORMAT 40 @@ -1229,7 +1217,6 @@ sendit (char *sp, char **arg, char *file, int pushed) case SSNDSW: case SOMLSW: case SNOOPSW: - case SASLSW: case TLSSW: vec[vecp++] = --cp; continue; @@ -1239,8 +1226,6 @@ sendit (char *sp, char **arg, char *file, int pushed) case WIDTHSW: case CLIESW: case SERVSW: - case SASLMECHSW: - case USERSW: case PORTSW: vec[vecp++] = --cp; if (!(cp = *argp++) || *cp == '-') { diff --git a/uip/whom.c b/uip/whom.c index ddf99ef..1d92ea3 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -11,12 +11,6 @@ #include #include -#ifndef CYRUS_SASL -# define SASLminc(a) (a) -#else /* CYRUS_SASL */ -# define SASLminc(a) 0 -#endif /* CYRUS_SASL */ - #ifndef TLS_SUPPORT # define TLSminc(a) (a) #else /* TLS_SUPPORT */ @@ -48,12 +42,6 @@ static struct swit switches[] = { { "server host", -6 }, #define SNOOPSW 11 { "snoop", -5 }, -#define SASLSW 12 - { "sasl", SASLminc(4) }, -#define SASLMECHSW 13 - { "saslmech mechanism", SASLminc(-5) }, -#define USERSW 14 - { "user username", SASLminc(-4) }, #define PORTSW 15 { "port server port name/number", 4 }, #define TLSSW 16 @@ -108,7 +96,6 @@ main (int argc, char **argv) case CHKSW: case NOCHKSW: case SNOOPSW: - case SASLSW: vec[vecp++] = --cp; continue; @@ -138,9 +125,7 @@ main (int argc, char **argv) case ALIASW: case CLIESW: case SERVSW: - case USERSW: case PORTSW: - case SASLMECHSW: vec[vecp++] = --cp; if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); -- 1.7.10.4