masqmail

changeset 268:7b12d081b939

find changesets by author, revision, files, or words in the commit message
removed ACC_DEL_RCPTS because it's always used with ACC_RCPT_FROM_HEAD They are used for -t and always together.
author markus schnalke <meillo@marmaro.de>
date Fri, 03 Dec 2010 11:40:58 -0300
parents 8be687c06c20
children fd1d77e5a5da
files src/accept.c src/masqmail.c src/masqmail.h
diffstat 3 files changed, 6 insertions(+), 8 deletions(-) [+]
line diff
     1.1 --- a/src/accept.c	Fri Dec 03 11:37:01 2010 -0300
     1.2 +++ b/src/accept.c	Fri Dec 03 11:40:58 2010 -0300
     1.3 @@ -59,9 +59,7 @@
     1.4  
     1.5     The -t option:
     1.6     The ACC_RCPT_FROM_HEAD flag adds the recipients found in To/Cc/Bcc
     1.7 -   headers to the recipients list.
     1.8 -   The ACC_DEL_RCPTS flag makes only sense if the ACC_RCPT_FROM_HEAD
     1.9 -   flag is given too. With ACC_DEL_RCPTS the recipients given on the
    1.10 +   headers to the recipients list. The recipients given on the
    1.11     command line are removed from the ones given in headers.
    1.12  */
    1.13  
    1.14 @@ -212,7 +210,7 @@
    1.15  	}
    1.16  
    1.17  	/* -t option (see comment above) */
    1.18 -	if (flags & ACC_DEL_RCPTS) {
    1.19 +	if (flags & ACC_RCPT_FROM_HEAD) {
    1.20  		non_rcpt_list = msg->rcpt_list;
    1.21  		msg->rcpt_list = NULL;
    1.22  	}
    1.23 @@ -326,8 +324,9 @@
    1.24  			}
    1.25  		}
    1.26  
    1.27 -		if (flags & ACC_DEL_RCPTS) {
    1.28 -			/* remove the recipients given on the command line from the ones given in headers
    1.29 +		if (flags & ACC_RCPT_FROM_HEAD) {
    1.30 +			/* remove the recipients given on the command line
    1.31 +			   from the ones given in headers
    1.32  			   -t option (see comment above) */
    1.33  			GList *rcpt_node;
    1.34  			foreach(non_rcpt_list, rcpt_node) {

     2.1 --- a/src/masqmail.c	Fri Dec 03 11:37:01 2010 -0300
     2.2 +++ b/src/masqmail.c	Fri Dec 03 11:40:58 2010 -0300
     2.3 @@ -702,7 +702,7 @@
     2.4  
     2.5  	case MODE_ACCEPT:
     2.6  		{
     2.7 -			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : 0)
     2.8 +			guint accept_flags = (opt_t ? ACC_RCPT_FROM_HEAD : 0)
     2.9  			                     | (opt_i ? ACC_DOT_IGNORE : ACC_NODOT_RELAX);
    2.10  			mode_accept(return_path, full_sender_name, accept_flags, &(argv[arg]), argc - arg);
    2.11  			exit(0);

     3.1 --- a/src/masqmail.h	Fri Dec 03 11:37:01 2010 -0300
     3.2 +++ b/src/masqmail.h	Fri Dec 03 11:40:58 2010 -0300
     3.3 @@ -282,7 +282,6 @@
     3.4  } msgout_perhost;
     3.5  
     3.6  /* flags for accept() */
     3.7 -#define ACC_DEL_RCPTS      0x02  /* -t option, delete rcpts that were given as cmd args */
     3.8  #define ACC_RCPT_FROM_HEAD 0x08  /* -t option, get rcpts from headers */
     3.9  #define ACC_DOT_IGNORE     0x10  /* a dot on a line itself does not end the message (-oi option) */
    3.10  #define ACC_MAIL_FROM_HEAD 0x40  /* get return path from header */