Mercurial > masqmail

changeset 268:7b12d081b939

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 (2010-12-03)
parents 8be687c06c20
children fd1d77e5a5da
files src/accept.c src/masqmail.c src/masqmail.h
diffstat 3 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/accept.c	Fri Dec 03 11:37:01 2010 -0300
+++ b/src/accept.c	Fri Dec 03 11:40:58 2010 -0300
@@ -59,9 +59,7 @@
 
    The -t option:
    The ACC_RCPT_FROM_HEAD flag adds the recipients found in To/Cc/Bcc
-   headers to the recipients list.
-   The ACC_DEL_RCPTS flag makes only sense if the ACC_RCPT_FROM_HEAD
-   flag is given too. With ACC_DEL_RCPTS the recipients given on the
+   headers to the recipients list. The recipients given on the
    command line are removed from the ones given in headers.
 */
 
@@ -212,7 +210,7 @@
 	}
 
 	/* -t option (see comment above) */
-	if (flags & ACC_DEL_RCPTS) {
+	if (flags & ACC_RCPT_FROM_HEAD) {
 		non_rcpt_list = msg->rcpt_list;
 		msg->rcpt_list = NULL;
 	}
@@ -326,8 +324,9 @@
 			}
 		}
 
-		if (flags & ACC_DEL_RCPTS) {
-			/* remove the recipients given on the command line from the ones given in headers
+		if (flags & ACC_RCPT_FROM_HEAD) {
+			/* remove the recipients given on the command line
+			   from the ones given in headers
 			   -t option (see comment above) */
 			GList *rcpt_node;
 			foreach(non_rcpt_list, rcpt_node) {
--- a/src/masqmail.c	Fri Dec 03 11:37:01 2010 -0300
+++ b/src/masqmail.c	Fri Dec 03 11:40:58 2010 -0300
@@ -702,7 +702,7 @@
 
 	case MODE_ACCEPT:
 		{
-			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : 0)
+			guint accept_flags = (opt_t ? ACC_RCPT_FROM_HEAD : 0)
 			                     | (opt_i ? ACC_DOT_IGNORE : ACC_NODOT_RELAX);
 			mode_accept(return_path, full_sender_name, accept_flags, &(argv[arg]), argc - arg);
 			exit(0);
--- a/src/masqmail.h	Fri Dec 03 11:37:01 2010 -0300
+++ b/src/masqmail.h	Fri Dec 03 11:40:58 2010 -0300
@@ -282,7 +282,6 @@
 } msgout_perhost;
 
 /* flags for accept() */
-#define ACC_DEL_RCPTS      0x02  /* -t option, delete rcpts that were given as cmd args */
 #define ACC_RCPT_FROM_HEAD 0x08  /* -t option, get rcpts from headers */
 #define ACC_DOT_IGNORE     0x10  /* a dot on a line itself does not end the message (-oi option) */
 #define ACC_MAIL_FROM_HEAD 0x40  /* get return path from header */