masqmail

changeset 247:3c40f86d50e4

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.
author markus schnalke <meillo@marmaro.de>
date Mon, 01 Nov 2010 13:30:02 -0300
parents 4cff8638dd9b
children 018cfd163f5c
files man/masqmail.8 src/masqmail.c
diffstat 2 files changed, 20 insertions(+), 0 deletions(-) [+]
line diff
     1.1 --- a/man/masqmail.8	Thu Oct 28 16:40:02 2010 -0300
     1.2 +++ b/man/masqmail.8	Mon Nov 01 13:30:02 2010 -0300
     1.3 @@ -124,6 +124,11 @@
     1.4  \fImasqmail \-bp\fP (\fImailq\fR).
     1.5  
     1.6  .TP
     1.7 +\fB\-m\fR
     1.8 +
     1.9 +Same as \fB\-om\fR, see below.
    1.10 +
    1.11 +.TP
    1.12  \fB\-oem\fR
    1.13  
    1.14  If the \fB\-oi\fR ist not also given, always return with a non zero return code.
    1.15 @@ -148,6 +153,15 @@
    1.16  A dot as a single character in a line does not terminate the message.
    1.17  
    1.18  .TP
    1.19 +\fB\-om\fR
    1.20 +
    1.21 +From exim(8)'s man page: In Sendmail, this option means ``me too'',
    1.22 +indicating that the sender of a message should receive a copy of the
    1.23 +message if the sender appears in an alias expansion.
    1.24 +
    1.25 +Masqmail always does this, hence the option does nothing. 
    1.26 +
    1.27 +.TP
    1.28  \fB\-q [\fIinterval\fB]\fR
    1.29  
    1.30  If not given with an argument, run a queue process, i.e. try to deliver all messages in the queue.
     2.1 --- a/src/masqmail.c	Thu Oct 28 16:40:02 2010 -0300
     2.2 +++ b/src/masqmail.c	Mon Nov 01 13:30:02 2010 -0300
     2.3 @@ -428,6 +428,9 @@
     2.4  					M_cmd = g_strdup(&(argv[arg][pos]));
     2.5  				}
     2.6  				break;
     2.7 +			case 'm':
     2.8 +				/* ignore -m (me too) switch (see man page) */
     2.9 +				break;
    2.10  			case 'o':
    2.11  				switch (argv[arg][pos++]) {
    2.12  				case 'e':
    2.13 @@ -446,6 +449,9 @@
    2.14  					opt_i = TRUE;
    2.15  					exit_failure = FALSE;  /* may override -oem */
    2.16  					break;
    2.17 +				case 'm':
    2.18 +					/* ignore -m (me too) switch (see man page) */
    2.19 +					break;
    2.20  				}
    2.21  				break;
    2.22