Mercurial > masqmail

changeset 107:9104234a56a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
never create headers from recipients because it could disclose private information
author meillo@marmaro.de
date Tue, 29 Jun 2010 10:45:33 +0200
parents 1f0d63713a1c
children 46f407c0727a
files src/masqmail.c src/masqmail.h src/smtpsend.c
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/masqmail.c	Tue Jun 29 10:37:18 2010 +0200
+++ b/src/masqmail.c	Tue Jun 29 10:45:33 2010 +0200
@@ -813,7 +813,7 @@
 
 	case MODE_ACCEPT:
 		{
-			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : ACC_HEAD_FROM_RCPT)
+			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : 0)
 			                     | (opt_i ? ACC_NODOT_TERM : ACC_NODOT_RELAX);
 			mode_accept(return_path, full_sender_name, accept_flags, &(argv[arg]), argc - arg);
 			exit(exit_failure ? EXIT_FAILURE : EXIT_SUCCESS);
--- a/src/masqmail.h	Tue Jun 29 10:37:18 2010 +0200
+++ b/src/masqmail.h	Tue Jun 29 10:45:33 2010 +0200
@@ -309,7 +309,6 @@
 
 /* flags for accept() */
 /*#define ACC_LOCAL      0x01 (we better use received_host == NULL) */
-#define ACC_HEAD_FROM_RCPT 0x01  /* create To: Header from rcpt_list (cmd line) */
 #define ACC_DEL_RCPTS      0x02  /* -t option, delete rcpts */
 #define ACC_RCPT_FROM_HEAD 0x08  /* -t option, get rcpts from headers */
 #define ACC_NODOT_TERM     0x10  /* a dot on a line itself does not end the message (-oi option) */
--- a/src/smtpsend.c	Tue Jun 29 10:37:18 2010 +0200
+++ b/src/smtpsend.c	Tue Jun 29 10:45:33 2010 +0200
@@ -99,7 +99,7 @@
 			msg->rcpt_list = g_list_append(msg->rcpt_list, create_address_qualified(argv[optind++], TRUE, conf.host_name));
 		}
 
-		if ((ret = accept_message(stdin, msg, ACC_NODOT_TERM | ACC_HEAD_FROM_RCPT)) == AERR_OK) {
+		if ((ret = accept_message(stdin, msg, ACC_NODOT_TERM)) == AERR_OK) {
 			if ((ret = smtp_deliver(server_name, server_port, resolve_list, msg, NULL, NULL)) == smtp_ok) {
 				exit(EXIT_SUCCESS);
 			}