automatically. */
if (fd >= 0)
- if (fchown(fd, exim_uid, exim_gid) || fchmod(fd, SPOOL_MODE))
+ if (exim_fchown(fd, exim_uid, exim_gid, temp_name) || fchmod(fd, SPOOL_MODE))
{
DEBUG(D_any) debug_printf("failed setting perms on %s\n", temp_name);
(void) close(fd); fd = -1;
spool_write_header(uschar *id, int where, uschar **errmsg)
{
int fd;
-int i;
int size_correction;
FILE * fp;
-header_line *h;
struct stat statbuf;
uschar * tname;
uschar * fname;
-tname = spool_fname(US"input", message_subdir,
- string_sprintf("hdr.%d", (int)getpid()), US"");
+tname = spool_fname(US"input", message_subdir, US"hdr.", message_id);
if ((fd = spool_open_temp(tname)) < 0)
return spool_write_error(where, errmsg, US"open", NULL, NULL);
if (bmi_verdicts) fprintf(fp, "-bmi_verdicts %s\n", bmi_verdicts);
#endif
-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS
if (tls_in.certificate_verified) fprintf(fp, "-tls_certificate_verified\n");
if (tls_in.cipher) fprintf(fp, "-tls_cipher %s\n", tls_in.cipher);
if (tls_in.peercert)
fprintf(fp, "-tls_ourcert %s\n", CS big_buffer);
}
if (tls_in.ocsp) fprintf(fp, "-tls_ocsp %d\n", tls_in.ocsp);
-
-# ifdef EXPERIMENTAL_REQUIRETLS
-if (tls_requiretls) fprintf(fp, "-tls_requiretls 0x%x\n", tls_requiretls);
+# ifdef EXPERIMENTAL_TLS_RESUME
+fprintf(fp, "-tls_resumption %c\n", 'A' + tls_in.resumption);
# endif
#endif
#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
tree_write(tree_nonrecipients, fp);
fprintf(fp, "%d\n", recipients_count);
-for (i = 0; i < recipients_count; i++)
+for (int i = 0; i < recipients_count; i++)
{
recipient_item *r = recipients_list + i;
- DEBUG(D_deliver) debug_printf("DSN: Flags :%d\n", r->dsn_flags);
+ DEBUG(D_deliver) debug_printf("DSN: Flags: 0x%x\n", r->dsn_flags);
- if (r->pno < 0 && r->errors_to == NULL && r->dsn_flags == 0)
+ if (r->pno < 0 && !r->errors_to && r->dsn_flags == 0)
fprintf(fp, "%s\n", r->address);
else
{
}
DEBUG(D_deliver) debug_printf("DSN: **** SPOOL_OUT - "
- "address: |%s| errorsto: |%s| orcpt: |%s| dsn_flags: %d\n",
+ "address: <%s> errorsto: <%s> orcpt: <%s> dsn_flags: 0x%x\n",
r->address, r->errors_to, r->orcpt, r->dsn_flags);
}
These are saved as a record for debugging. Don't included them in the message's
size. */
-for (h = header_list; h; h = h->next)
+for (header_line * h = header_list; h; h = h->next)
{
fprintf(fp, "%03d%c %s", h->slen, h->type, h->text);
size_correction += 5;