diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-14 19:14:54 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-14 19:14:54 +0200 |
| commit | 9de7509aa013a8634b13a29008cd58ca971c9c7c (patch) | |
| tree | b41fbb22afb4ef32661043c010f8d430a165386b /mailutils | |
| parent | 2ae86ad1c64b4de9bb63464d9a783229ed8e5dd0 (diff) | |
| download | busybox-w32-9de7509aa013a8634b13a29008cd58ca971c9c7c.tar.gz busybox-w32-9de7509aa013a8634b13a29008cd58ca971c9c7c.tar.bz2 busybox-w32-9de7509aa013a8634b13a29008cd58ca971c9c7c.zip | |
sendmail: improve help text
* explain which server we contact by default
* explain when auth is done
* -t is not implied! remove that from help text
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'mailutils')
| -rw-r--r-- | mailutils/sendmail.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index fb4dbb3da..a93be707d 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c | |||
| @@ -10,7 +10,8 @@ | |||
| 10 | //kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o | 10 | //kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o |
| 11 | 11 | ||
| 12 | //usage:#define sendmail_trivial_usage | 12 | //usage:#define sendmail_trivial_usage |
| 13 | //usage: "[OPTIONS] [RECIPIENT_EMAIL]..." | 13 | //usage: "[-tv] [-f SENDER] [-amLOGIN 4<user_pass.txt | -auUSER -apPASS]" |
| 14 | //usage: "\n [-w SECS] [RECIPIENT_EMAIL]..." | ||
| 14 | //usage:#define sendmail_full_usage "\n\n" | 15 | //usage:#define sendmail_full_usage "\n\n" |
| 15 | //usage: "Read email from stdin and send it\n" | 16 | //usage: "Read email from stdin and send it\n" |
| 16 | //usage: "\nStandard options:" | 17 | //usage: "\nStandard options:" |
| @@ -18,27 +19,24 @@ | |||
| 18 | //usage: "\n -f SENDER For use in MAIL FROM:<sender>. Can be empty string" | 19 | //usage: "\n -f SENDER For use in MAIL FROM:<sender>. Can be empty string" |
| 19 | //usage: "\n Default: -auUSER, or username of current UID" | 20 | //usage: "\n Default: -auUSER, or username of current UID" |
| 20 | //usage: "\n -o OPTIONS Various options. -oi implied, others are ignored" | 21 | //usage: "\n -o OPTIONS Various options. -oi implied, others are ignored" |
| 21 | //usage: "\n -i -oi synonym. implied and ignored" | 22 | //usage: "\n -i -oi synonym, implied and ignored" |
| 22 | //usage: "\n" | 23 | //usage: "\n" |
| 23 | //usage: "\nBusybox specific options:" | 24 | //usage: "\nBusybox specific options:" |
| 24 | //usage: "\n -v Verbose" | 25 | //usage: "\n -v Verbose" |
| 25 | //usage: "\n -w SECS Network timeout" | 26 | //usage: "\n -w SECS Network timeout" |
| 26 | //usage: "\n -H 'PROG ARGS' Run connection helper" | 27 | //usage: "\n -H 'PROG ARGS' Run connection helper. Examples:" |
| 27 | //usage: "\n Examples:" | 28 | //usage: "\n openssl s_client -quiet -tls1 -starttls smtp -connect smtp.gmail.com:25" |
| 28 | //usage: "\n -H 'exec openssl s_client -quiet -tls1 -starttls smtp" | 29 | //usage: "\n openssl s_client -quiet -tls1 -connect smtp.gmail.com:465" |
| 29 | //usage: "\n -connect smtp.gmail.com:25' <email.txt" | 30 | //usage: "\n -S HOST[:PORT] Server (default $SMTPHOST or 127.0.0.1)" |
| 30 | //usage: "\n [4<username_and_passwd.txt | -auUSER -apPASS]" | 31 | //usage: "\n -amLOGIN Log in using AUTH LOGIN (-amCRAM-MD5 not supported)" |
| 31 | //usage: "\n -H 'exec openssl s_client -quiet -tls1" | 32 | //usage: "\n -auUSER Username for AUTH" |
| 32 | //usage: "\n -connect smtp.gmail.com:465' <email.txt" | 33 | //usage: "\n -apPASS Password for AUTH" |
| 33 | //usage: "\n [4<username_and_passwd.txt | -auUSER -apPASS]" | ||
| 34 | //usage: "\n -S HOST[:PORT] Server" | ||
| 35 | //usage: "\n -auUSER Username for AUTH LOGIN" | ||
| 36 | //usage: "\n -apPASS Password for AUTH LOGIN" | ||
| 37 | ////usage: "\n -amMETHOD Authentication method. Ignored. LOGIN is implied" | ||
| 38 | //usage: "\n" | 34 | //usage: "\n" |
| 39 | //usage: "\nOther options are silently ignored; -oi -t is implied" | 35 | //usage: "\nIf no -a options are given, authentication is not done." |
| 36 | //usage: "\nIf -amLOGIN is given but no -au/-ap, user/password is read from fd #4." | ||
| 37 | //usage: "\nOther options are silently ignored; -oi is implied." | ||
| 40 | //usage: IF_MAKEMIME( | 38 | //usage: IF_MAKEMIME( |
| 41 | //usage: "\nUse makemime to create emails with attachments" | 39 | //usage: "\nUse makemime to create emails with attachments." |
| 42 | //usage: ) | 40 | //usage: ) |
| 43 | 41 | ||
| 44 | /* Currently we don't sanitize or escape user-supplied SENDER and RECIPIENT_EMAILs. | 42 | /* Currently we don't sanitize or escape user-supplied SENDER and RECIPIENT_EMAILs. |