X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2944124ccb62cbf64e44bc8e0894fb30307514da..3f06b9b4c7244b169d50bce216c1f54b4dfe7efb:/src/src/spool_out.c diff --git a/src/src/spool_out.c b/src/src/spool_out.c index acc6c7b5f..113765bab 100644 --- a/src/src/spool_out.c +++ b/src/src/spool_out.c @@ -3,6 +3,7 @@ *************************************************/ /* Copyright (c) University of Cambridge 1995 - 2018 */ +/* Copyright (c) The Exim Maintainers 2020 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for writing spool files, and moving them about. */ @@ -173,9 +174,11 @@ if (sender_host_address) fprintf(fp, "-host_address %s.%d\n", sender_host_address, sender_host_port); if (sender_host_name) spool_var_write(fp, US"host_name", sender_host_name); - if (sender_host_authenticated) - spool_var_write(fp, US"host_auth", sender_host_authenticated); } +if (sender_host_authenticated) + spool_var_write(fp, US"host_auth", sender_host_authenticated); +if (sender_host_auth_pubname) + spool_var_write(fp, US"host_auth_pubname", sender_host_auth_pubname); /* Also about the interface a message came in on */ @@ -260,9 +263,10 @@ if (tls_in.ourcert) fprintf(fp, "-tls_ourcert %s\n", CS big_buffer); } if (tls_in.ocsp) fprintf(fp, "-tls_ocsp %d\n", tls_in.ocsp); -# ifdef EXPERIMENTAL_TLS_RESUME +# ifndef DISABLE_TLS_RESUME fprintf(fp, "-tls_resumption %c\n", 'A' + tls_in.resumption); # endif +if (tls_in.ver) spool_var_write(fp, US"tls_ver", tls_in.ver); #endif #ifdef SUPPORT_I18N @@ -275,9 +279,9 @@ if (message_smtputf8) #endif /* Write the dsn flags to the spool header file */ -DEBUG(D_deliver) debug_printf("DSN: Write SPOOL: -dsn_envid %s\n", dsn_envid); +/* DEBUG(D_deliver) debug_printf("DSN: Write SPOOL: -dsn_envid %s\n", dsn_envid); */ if (dsn_envid) fprintf(fp, "-dsn_envid %s\n", dsn_envid); -DEBUG(D_deliver) debug_printf("DSN: Write SPOOL :-dsn_ret %d\n", dsn_ret); +/* DEBUG(D_deliver) debug_printf("DSN: Write SPOOL: -dsn_ret %d\n", dsn_ret); */ if (dsn_ret) fprintf(fp, "-dsn_ret %d\n", dsn_ret); /* To complete the envelope, write out the tree of non-recipients, followed by @@ -291,7 +295,7 @@ for (int i = 0; i < recipients_count; i++) { recipient_item *r = recipients_list + i; - DEBUG(D_deliver) debug_printf("DSN: Flags: 0x%x\n", r->dsn_flags); + /* DEBUG(D_deliver) debug_printf("DSN: Flags: 0x%x\n", r->dsn_flags); */ if (r->pno < 0 && !r->errors_to && r->dsn_flags == 0) fprintf(fp, "%s\n", r->address); @@ -405,8 +409,6 @@ return statbuf.st_size - size_correction; } -#ifdef SUPPORT_MOVE_FROZEN_MESSAGES - /************************************************ * Make a hard link * ************************************************/ @@ -417,6 +419,7 @@ start-up time. Arguments: dir base directory name + dq destiinationqueue name subdir subdirectory name id message id suffix suffix to add to id @@ -429,11 +432,11 @@ Returns: TRUE if all went well */ static BOOL -make_link(uschar *dir, uschar *subdir, uschar *id, uschar *suffix, uschar *from, - uschar *to, BOOL noentok) +make_link(uschar *dir, uschar * dq, uschar *subdir, uschar *id, uschar *suffix, + uschar *from, uschar *to, BOOL noentok) { uschar * fname = spool_fname(string_sprintf("%s%s", from, dir), subdir, id, suffix); -uschar * tname = spool_fname(string_sprintf("%s%s", to, dir), subdir, id, suffix); +uschar * tname = spool_q_fname(string_sprintf("%s%s", to, dir), dq, subdir, id, suffix); if (Ulink(fname, tname) < 0 && (!noentok || errno != ENOENT)) { log_write(0, LOG_MAIN|LOG_PANIC, "link(\"%s\", \"%s\") failed while moving " @@ -487,8 +490,7 @@ return TRUE; /* Move the files for a message (-H, -D, and msglog) from one directory (or hierarchy) to another. It is assume that there is no -J file in existence when -this is done. At present, this is used only when move_frozen_messages is set, -so compile it only when that support is configured. +this is done. Arguments: id the id of the message to be delivered @@ -503,13 +505,18 @@ Returns: TRUE if all is well BOOL spool_move_message(uschar *id, uschar *subdir, uschar *from, uschar *to) { +uschar * dest_qname = queue_name_dest ? queue_name_dest : queue_name; + +/* Since we are working within the spool, de-taint the dest queue name */ +dest_qname = string_copy_taint(dest_qname, FALSE); + /* Create any output directories that do not exist. */ (void) directory_make(spool_directory, - spool_sname(string_sprintf("%sinput", to), subdir), + spool_q_sname(string_sprintf("%sinput", to), dest_qname, subdir), INPUT_DIRECTORY_MODE, TRUE); (void) directory_make(spool_directory, - spool_sname(string_sprintf("%smsglog", to), subdir), + spool_q_sname(string_sprintf("%smsglog", to), dest_qname, subdir), INPUT_DIRECTORY_MODE, TRUE); /* Move the message by first creating new hard links for all the files, and @@ -521,9 +528,9 @@ rule of waiting for a -H file before doing anything. When moving messages off the mail spool, the -D file should be open and locked at the time, thus keeping Exim's hands off. */ -if (!make_link(US"msglog", subdir, id, US"", from, to, TRUE) || - !make_link(US"input", subdir, id, US"-D", from, to, FALSE) || - !make_link(US"input", subdir, id, US"-H", from, to, FALSE)) +if (!make_link(US"msglog", dest_qname, subdir, id, US"", from, to, TRUE) || + !make_link(US"input", dest_qname, subdir, id, US"-D", from, to, FALSE) || + !make_link(US"input", dest_qname, subdir, id, US"-H", from, to, FALSE)) return FALSE; if (!break_link(US"input", subdir, id, US"-H", from, FALSE) || @@ -531,13 +538,15 @@ if (!break_link(US"input", subdir, id, US"-H", from, FALSE) || !break_link(US"msglog", subdir, id, US"", from, TRUE)) return FALSE; -log_write(0, LOG_MAIN, "moved from %sinput, %smsglog to %sinput, %smsglog", - from, from, to, to); +log_write(0, LOG_MAIN, "moved from %s%s%s%sinput, %smsglog to %s%s%s%sinput, %smsglog", + *queue_name?"(":"", *queue_name?queue_name:US"", *queue_name?") ":"", + from, from, + *dest_qname?"(":"", *dest_qname?dest_qname:US"", *dest_qname?") ":"", + to, to); return TRUE; } -#endif /* End of spool_out.c */ /* vi: aw ai sw=2