Removed SASL support. We don't need it anymore because we talk SMTP no more

diff --git a/configure.in b/configure.in
index 6a4dfff1da7b720fa227a3c1c6eecba5ceafe2f2..29c0bc96e90db928b8ae3f296e8b26b5713e671c 100644 (file)
--- 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 c27b8d355edaa07f69551747d432d5050b5eddec..603e34ad00603eddba7122d70e93453fae7dc0c2 100644 (file)
--- 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 0f626317e90b38ea51c4a2c5290d20c2bfa67249..85edbc4e93989d78fd2fbdb689587d3a8b5d980c 100644 (file)
--- 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 e75583eb5fe9117d9c199b1e75a3031f50b1b202..e18ed20d2a65673587f370305c9444ccc9718b73 100644 (file)
--- 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 d06b6c4ae40c3e8407df5483dedf57f7ab18eee7..a97bab824eccbb48b9a22b8294de287ce73044da 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -13,12 +13,6 @@
 #include <signal.h>
 
 
-#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 6541b42ed08b53ed6a27fac31b7e9db24ccf3367..cb48bfdc6662a94330bc4357b197f7afda8ef687 100644 (file)
--- 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 ddf99efb2ae7d58aa3861c11eed125f019637098..1d92ea36893d6758cb52b2eac42e71ec33a62355 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -11,12 +11,6 @@
 #include <h/signals.h>
 #include <signal.h>
 
-#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]);