masqmail

changeset 107:9104234a56a5

find changesets by author, revision, files, or words in the commit message
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 diff
     1.1 --- a/src/masqmail.c	Tue Jun 29 10:37:18 2010 +0200
     1.2 +++ b/src/masqmail.c	Tue Jun 29 10:45:33 2010 +0200
     1.3 @@ -813,7 +813,7 @@
     1.4  
     1.5  	case MODE_ACCEPT:
     1.6  		{
     1.7 -			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : ACC_HEAD_FROM_RCPT)
     1.8 +			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : 0)
     1.9  			                     | (opt_i ? ACC_NODOT_TERM : ACC_NODOT_RELAX);
    1.10  			mode_accept(return_path, full_sender_name, accept_flags, &(argv[arg]), argc - arg);
    1.11  			exit(exit_failure ? EXIT_FAILURE : EXIT_SUCCESS);

     2.1 --- a/src/masqmail.h	Tue Jun 29 10:37:18 2010 +0200
     2.2 +++ b/src/masqmail.h	Tue Jun 29 10:45:33 2010 +0200
     2.3 @@ -309,7 +309,6 @@
     2.4  
     2.5  /* flags for accept() */
     2.6  /*#define ACC_LOCAL      0x01 (we better use received_host == NULL) */
     2.7 -#define ACC_HEAD_FROM_RCPT 0x01  /* create To: Header from rcpt_list (cmd line) */
     2.8  #define ACC_DEL_RCPTS      0x02  /* -t option, delete rcpts */
     2.9  #define ACC_RCPT_FROM_HEAD 0x08  /* -t option, get rcpts from headers */
    2.10  #define ACC_NODOT_TERM     0x10  /* a dot on a line itself does not end the message (-oi option) */

     3.1 --- a/src/smtpsend.c	Tue Jun 29 10:37:18 2010 +0200
     3.2 +++ b/src/smtpsend.c	Tue Jun 29 10:45:33 2010 +0200
     3.3 @@ -99,7 +99,7 @@
     3.4  			msg->rcpt_list = g_list_append(msg->rcpt_list, create_address_qualified(argv[optind++], TRUE, conf.host_name));
     3.5  		}
     3.6  
     3.7 -		if ((ret = accept_message(stdin, msg, ACC_NODOT_TERM | ACC_HEAD_FROM_RCPT)) == AERR_OK) {
     3.8 +		if ((ret = accept_message(stdin, msg, ACC_NODOT_TERM)) == AERR_OK) {
     3.9  			if ((ret = smtp_deliver(server_name, server_port, resolve_list, msg, NULL, NULL)) == smtp_ok) {
    3.10  				exit(EXIT_SUCCESS);
    3.11  			}