git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Intercept chown()/fchown() failure and emit a pointer to the bugreport. Closes 2391
[exim.git]
/
src
/
src
/
spool_out.c
diff --git
a/src/src/spool_out.c
b/src/src/spool_out.c
index 8b227dedb139f669f87e77882ccd46103855a32b..46a490a9324266ead100f2adf3e1d05643192eda 100644
(file)
--- a/
src/src/spool_out.c
+++ b/
src/src/spool_out.c
@@
-92,7
+92,7
@@
double-check the mode because the group setting doesn't always get set
automatically. */
if (fd >= 0)
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;
{
DEBUG(D_any) debug_printf("failed setting perms on %s\n", temp_name);
(void) close(fd); fd = -1;
@@
-134,8
+134,7
@@
struct stat statbuf;
uschar * tname;
uschar * fname;
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 ((fd = spool_open_temp(tname)) < 0)
return spool_write_error(where, errmsg, US"open", NULL, NULL);
@@
-250,10
+249,6
@@
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);
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);
-# endif
#endif
#ifdef SUPPORT_I18N
#endif
#ifdef SUPPORT_I18N