Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-05 21:30:50 +00:00
Code Issues Projects Releases Wiki Activity

sendmail: accept -i too, not only -oi

Browse Source 
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Vladimir Dronnikov 2009-10-04 01:34:54 +02:00 committed by Denys Vlasenko
parent 76622dbd16
commit b618dba103
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/usage.h
View File

@ -3814,6 +3814,7 @@
"\n -t Read additional recipients from message body" \ "\n -t Read additional recipients from message body" \
"\n -f sender Sender (required)" \ "\n -f sender Sender (required)" \
"\n -o options Various options. -oi implied, others are ignored" \ "\n -o options Various options. -oi implied, others are ignored" \
"\n -i -oi synonym. implied and ignored" \
"\n" \ "\n" \
"\nBusybox specific options:" \ "\nBusybox specific options:" \
"\n -w seconds Network timeout" \ "\n -w seconds Network timeout" \

11
mailutils/sendmail.c
View File

@ -73,11 +73,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
OPT_t = 1 << 0, // read message for recipients, append them to those on cmdline OPT_t = 1 << 0, // read message for recipients, append them to those on cmdline
OPT_f = 1 << 1, // sender address OPT_f = 1 << 1, // sender address
OPT_o = 1 << 2, // various options. -oi IMPLIED! others are IGNORED! OPT_o = 1 << 2, // various options. -oi IMPLIED! others are IGNORED!
OPT_i = 1 << 3, // IMPLIED!
//--- BB specific options //--- BB specific options
OPT_w = 1 << 3, // network timeout OPT_w = 1 << 4, // network timeout
OPT_H = 1 << 4, // use external connection helper OPT_H = 1 << 5, // use external connection helper
OPT_S = 1 << 5, // specify connection string OPT_S = 1 << 6, // specify connection string
OPT_a = 1 << 6, // authentication tokens OPT_a = 1 << 7, // authentication tokens
}; };
// init global variables // init global variables
@ -93,7 +94,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
// N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect
// -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility,
// it is still under development. // it is still under development.
opts = getopt32(argv, "tf:o:w:H:S:a::", &opt_from, NULL, &timeout, &opt_connect, &opt_connect, &list); opts = getopt32(argv, "tf:o:iw:H:S:a::", &opt_from, NULL, &timeout, &opt_connect, &opt_connect, &list);
//argc -= optind; //argc -= optind;
argv += optind; argv += optind;

2
miscutils/crond.c
View File

@ -29,7 +29,7 @@
#define SENDMAIL "sendmail" #define SENDMAIL "sendmail"
#endif #endif
#ifndef SENDMAIL_ARGS #ifndef SENDMAIL_ARGS
#define SENDMAIL_ARGS "-ti", "oem" #define SENDMAIL_ARGS "-ti", NULL
#endif #endif
#ifndef CRONUPDATE #ifndef CRONUPDATE
#define CRONUPDATE "cron.update" #define CRONUPDATE "cron.update"