Permalink
Browse files

sendmail: Ignore all sendmail options

  • Loading branch information...
1 parent 2704d13 commit 16674b30624c3240aad4b4ad1b9e85e6c08f7e8e @bruceg committed Jun 12, 2012
Showing with 2 additions and 21 deletions.
  1. +1 −1 NEWS
  2. +1 −20 src/sendmail.cc
View
2 NEWS
@@ -2,7 +2,7 @@ This file lists all the major user-visible changes to nullmailer.
-------------------------------------------------------------------------------
Changes in version 1.11
-- Added additional compatibility flags to the sendmail wrapper.
+- Simplify (and expand) handling of ignored sendmail options.
- Fixed command-line interpretation of short options with values.
View
21 src/sendmail.cc
@@ -66,32 +66,13 @@ cli_option cli_options[] = {
{ 'N', 0, cli_option::string, 0, &o_dummys, "Ignored", 0 },
{ 'n', 0, cli_option::flag, 0, &o_dummyi, "Ignored", 0 },
{ 'O', 0, cli_option::string, 0, &o_dummys, "Ignored", 0 },
- { 0, "odb", cli_option::flag, 0, &o_dummyi,
- "Deliver in background (always true)", 0 },
- { 0, "odd", cli_option::flag, 0, &o_dummyi,
- "Defer delivery (ignored)", 0 },
- { 0, "odf", cli_option::flag, 0, &o_dummyi,
- "Deliver in foreground (ignored)", 0 },
- { 0, "odi", cli_option::flag, 0, &o_dummyi,
- "Deliver interactively (synchronously) (ignored)", 0 },
- { 0, "odq", cli_option::flag, 0, &o_dummyi,
- "Just queue the message (ignored)", 0 },
- { 0, "oem", cli_option::flag, 0, &o_dummyi,
- "Ignored", 0 },
+ { 'o', 0, cli_option::string, 0, &o_dummys, "Set sendmail option, ignored", 0 },
{ 0, "em", cli_option::flag, 0, &o_dummyi,
"Ignored", 0 },
- { 0, "oep", cli_option::flag, 0, &o_dummyi,
- "Ignored", 0 },
{ 0, "ep", cli_option::flag, 0, &o_dummyi,
"Ignored", 0 },
- { 0, "oeq", cli_option::flag, 0, &o_dummyi,
- "Ignored", 0 },
{ 0, "eq", cli_option::flag, 0, &o_dummyi,
"Ignored", 0 },
- { 0, "oi", cli_option::flag, 0, &o_dummyi,
- "Ignored", 0 },
- { 0, "om", cli_option::flag, 0, &o_dummyi,
- "Ignored", 0 },
{ 'p', 0, cli_option::string, 0, &o_dummys, "Ignored", 0 },
{ 'q', 0, cli_option::string, 0, &o_dummys, "Ignored", 0 },
{ 'R', 0, cli_option::string, 0, &o_dummys, "Ignored", 0 },

0 comments on commit 16674b3

Please sign in to comment.