# HG changeset patch # User markus schnalke # Date 1288629002 10800 # Node ID 3c40f86d50e4daf5ea719fa841353d23124c91fc # Parent 4cff8638dd9b88cab23740ce38a36b5c1536f60d ignoring -m switch now Some software (e.g. spost of nmh) calls sendmail with -m. Until now, masqmail failed on this unrecognized option. From now on it is ignored. See man/masqmail.8 for the meaning of -m. diff -r 4cff8638dd9b -r 3c40f86d50e4 man/masqmail.8 --- a/man/masqmail.8 Thu Oct 28 16:40:02 2010 -0300 +++ b/man/masqmail.8 Mon Nov 01 13:30:02 2010 -0300 @@ -124,6 +124,11 @@ \fImasqmail \-bp\fP (\fImailq\fR). .TP +\fB\-m\fR + +Same as \fB\-om\fR, see below. + +.TP \fB\-oem\fR If the \fB\-oi\fR ist not also given, always return with a non zero return code. @@ -148,6 +153,15 @@ A dot as a single character in a line does not terminate the message. .TP +\fB\-om\fR + +From exim(8)'s man page: In Sendmail, this option means ``me too'', +indicating that the sender of a message should receive a copy of the +message if the sender appears in an alias expansion. + +Masqmail always does this, hence the option does nothing. + +.TP \fB\-q [\fIinterval\fB]\fR If not given with an argument, run a queue process, i.e. try to deliver all messages in the queue. diff -r 4cff8638dd9b -r 3c40f86d50e4 src/masqmail.c --- a/src/masqmail.c Thu Oct 28 16:40:02 2010 -0300 +++ b/src/masqmail.c Mon Nov 01 13:30:02 2010 -0300 @@ -428,6 +428,9 @@ M_cmd = g_strdup(&(argv[arg][pos])); } break; + case 'm': + /* ignore -m (me too) switch (see man page) */ + break; case 'o': switch (argv[arg][pos++]) { case 'e': @@ -446,6 +449,9 @@ opt_i = TRUE; exit_failure = FALSE; /* may override -oem */ break; + case 'm': + /* ignore -m (me too) switch (see man page) */ + break; } break;