diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-28 12:42:47 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-28 12:42:47 +0000 |
| commit | 382afc6ba69545d52398da6b437e487aa23f185d (patch) | |
| tree | 5854c3f9832ebfd31191c10fdce85ab224359a7e /src | |
| parent | 30dba1e609d941013dc8421de5104dad387ac5b1 (diff) | |
Add authenticated_sender_force to the smtp transport.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/transports/smtp.c | 8 | ||||
| -rw-r--r-- | src/src/transports/smtp.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 93cbd221f..345fb951b 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/transports/smtp.c,v 1.22 2006/02/23 12:41:23 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transports/smtp.c,v 1.23 2006/02/28 12:42:47 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -25,6 +25,8 @@ optionlist smtp_transport_options[] = { (void *)offsetof(smtp_transport_options_block, allow_localhost) }, { "authenticated_sender", opt_stringptr, (void *)offsetof(smtp_transport_options_block, authenticated_sender) }, + { "authenticated_sender_force", opt_bool, + (void *)offsetof(smtp_transport_options_block, authenticated_sender_force) }, { "command_timeout", opt_time, (void *)offsetof(smtp_transport_options_block, command_timeout) }, { "connect_timeout", opt_time, @@ -158,6 +160,7 @@ smtp_transport_options_block smtp_transport_option_defaults = { 5, /* hosts_max_try */ 50, /* hosts_max_try_hardlimit */ FALSE, /* allow_localhost */ + FALSE, /* authenticated_sender_force */ FALSE, /* gethostbyname */ TRUE, /* dns_qualify_single */ FALSE, /* dns_search_parents */ @@ -1310,7 +1313,8 @@ if (smtp_use_size) /* Add the authenticated sender address if present */ -if (smtp_authenticated && local_authenticated_sender != NULL) +if ((smtp_authenticated || ob->authenticated_sender_force) && + local_authenticated_sender != NULL) { string_format(p, sizeof(buffer) - (p-buffer), " AUTH=%s", auth_xtextencode(local_authenticated_sender, diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h index cd6f396c6..05f02bc00 100644 --- a/src/src/transports/smtp.h +++ b/src/src/transports/smtp.h @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/transports/smtp.h,v 1.7 2006/02/07 11:19:03 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transports/smtp.h,v 1.8 2006/02/28 12:42:47 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -34,6 +34,7 @@ typedef struct { int hosts_max_try; int hosts_max_try_hardlimit; BOOL allow_localhost; + BOOL authenticated_sender_force; BOOL gethostbyname; BOOL dns_qualify_single; BOOL dns_search_parents; |