1 files changed, 28 insertions, 26 deletions

diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index fb4dbb3da..1242795b8 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -10,7 +10,8 @@
 //kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o
 
 //usage:#define sendmail_trivial_usage
-//usage:       "[OPTIONS] [RECIPIENT_EMAIL]..."
+//usage:       "[-tv] [-f SENDER] [-amLOGIN 4<user_pass.txt | -auUSER -apPASS]"
+//usage:     "\n                [-w SECS] [-H 'PROG ARGS' | -S HOST] [RECIPIENT_EMAIL]..."
 //usage:#define sendmail_full_usage "\n\n"
 //usage:       "Read email from stdin and send it\n"
 //usage:     "\nStandard options:"
@@ -18,27 +19,25 @@
 //usage:     "\n        -f SENDER       For use in MAIL FROM:<sender>. Can be empty string"
 //usage:     "\n                        Default: -auUSER, or username of current UID"
 //usage:     "\n        -o OPTIONS      Various options. -oi implied, others are ignored"
-//usage:     "\n        -i              -oi synonym. implied and ignored"
+//usage:     "\n        -i              -oi synonym, implied and ignored"
 //usage:     "\n"
 //usage:     "\nBusybox specific options:"
 //usage:     "\n        -v              Verbose"
 //usage:     "\n        -w SECS         Network timeout"
-//usage:     "\n        -H 'PROG ARGS'  Run connection helper"
-//usage:     "\n                        Examples:"
-//usage:     "\n                        -H 'exec openssl s_client -quiet -tls1 -starttls smtp"
-//usage:     "\n                                -connect smtp.gmail.com:25' <email.txt"
-//usage:     "\n                                [4<username_and_passwd.txt | -auUSER -apPASS]"
-//usage:     "\n                        -H 'exec openssl s_client -quiet -tls1"
-//usage:     "\n                                -connect smtp.gmail.com:465' <email.txt"
-//usage:     "\n                                [4<username_and_passwd.txt | -auUSER -apPASS]"
-//usage:     "\n        -S HOST[:PORT]  Server"
-//usage:     "\n        -auUSER         Username for AUTH LOGIN"
-//usage:     "\n        -apPASS         Password for AUTH LOGIN"
-////usage:     "\n      -amMETHOD       Authentication method. Ignored. LOGIN is implied"
+//usage:     "\n        -H 'PROG ARGS'  Run connection helper. Examples:"
+//usage:     "\n                openssl s_client -quiet -tls1 -starttls smtp -connect smtp.gmail.com:25"
+//usage:     "\n                openssl s_client -quiet -tls1 -connect smtp.gmail.com:465"
+//usage:     "\n                        $SMTP_ANTISPAM_DELAY: seconds to wait after helper connect"
+//usage:     "\n        -S HOST[:PORT]  Server (default $SMTPHOST or 127.0.0.1)"
+//usage:     "\n        -amLOGIN        Log in using AUTH LOGIN (-amCRAM-MD5 not supported)"
+//usage:     "\n        -auUSER         Username for AUTH"
+//usage:     "\n        -apPASS         Password for AUTH"
 //usage:     "\n"
-//usage:     "\nOther options are silently ignored; -oi -t is implied"
+//usage:     "\nIf no -a options are given, authentication is not done."
+//usage:     "\nIf -amLOGIN is given but no -au/-ap, user/password is read from fd #4."
+//usage:     "\nOther options are silently ignored; -oi is implied."
 //usage:        IF_MAKEMIME(
-//usage:     "\nUse makemime to create emails with attachments"
+//usage:     "\nUse makemime to create emails with attachments."
 //usage:        )
 
 /* Currently we don't sanitize or escape user-supplied SENDER and RECIPIENT_EMAILs.
@@ -209,7 +208,7 @@ static void rcptto_list(const char *list)
 int sendmail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sendmail_main(int argc UNUSED_PARAM, char **argv)
 {
-        char *opt_connect = opt_connect;
+        char *opt_connect;
         char *opt_from = NULL;
         char *s;
         llist_t *list = NULL;
@@ -241,6 +240,11 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
         // init global variables
         INIT_G();
 
+        // default HOST[:PORT] is $SMTPHOST, or localhost
+        opt_connect = getenv("SMTPHOST");
+        if (!opt_connect)
+                opt_connect = (char *)"127.0.0.1";
+
         // save initial stdin since body is piped!
         xdup2(STDIN_FILENO, 3);
         G.fp0 = xfdopen_for_read(3);
@@ -276,6 +280,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
 
         // connection helper ordered? ->
         if (opts & OPT_H) {
+                const char *delay;
                 const char *args[] = { "sh", "-c", opt_connect, NULL };
                 // plug it in
                 launch_helper(args);
@@ -294,7 +299,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
                 // before 220 reached it. The code below is unsafe in this regard:
                 // in non-STARTTLSed case, we potentially send NOOP before 220
                 // is sent by server.
-                // Ideas? (--delay SECS opt? --assume-starttls-helper opt?)
+                //
+                // If $SMTP_ANTISPAM_DELAY is set, we pause before sending NOOP.
+                //
+                delay = getenv("SMTP_ANTISPAM_DELAY");
+                if (delay)
+                        sleep(atoi(delay));
                 code = smtp_check("NOOP", -1);
                 if (code == 220)
                         // we got 220 - this is not STARTTLSed connection,
@@ -306,14 +316,6 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
         } else {
                 // vanilla connection
                 int fd;
-                // host[:port] not explicitly specified? -> use $SMTPHOST
-                // no $SMTPHOST? -> use localhost
-                if (!(opts & OPT_S)) {
-                        opt_connect = getenv("SMTPHOST");
-                        if (!opt_connect)
-                                opt_connect = (char *)"127.0.0.1";
-                }
-                // do connect
                 fd = create_and_connect_stream_or_die(opt_connect, 25);
                 // and make ourselves a simple IO filter
                 xmove_fd(fd, STDIN_FILENO);