Attachment #424528 for bug #63420

View | Details | Raw Unified | Return to bug 63420
Collapse All | Expand All

Lines 1123-1129 SYSTEM_ALIASES_FILE=/etc/aliases Link Here

(-)a/src/EDITME (-1 / +1 lines)
1123	# it replaces the value with what is defined here. Commenting this setting	1123	# it replaces the value with what is defined here. Commenting this setting
1124	# suppresses the check altogether.	1124	# suppresses the check altogether.
1125		1125
1126	TMPDIR="/tmp"	1126	EXIM_TMPDIR="/tmp"
1127		1127
1128		1128
1129	#------------------------------------------------------------------------------	1129	#------------------------------------------------------------------------------

Lines 150-156 it's a default value. */ Link Here

(-)a/src/config.h.defaults (-1 / +1 lines)
150		150
151	#define TCP_WRAPPERS_DAEMON_NAME "exim"	151	#define TCP_WRAPPERS_DAEMON_NAME "exim"
152	#define TIMEZONE_DEFAULT	152	#define TIMEZONE_DEFAULT
153	#define TMPDIR	153	#define EXIM_TMPDIR
154		154
155	#define TRANSPORT_APPENDFILE	155	#define TRANSPORT_APPENDFILE
156	#define TRANSPORT_AUTOREPLY	156	#define TRANSPORT_AUTOREPLY




temporary files are created; Exim doesn't use these (apart from when delivering
to MBX mailboxes), but called libraries such as DBM libraries may require them.
If TMPDIR is found in the environment, reset it to the value defined in the
EXIM_TMPDIR macro, if this macro is defined. */

#ifdef EXIM_TMPDIR
  {
  uschar **p;
  for (p = USS environ; *p != NULL; p++)
    {
    if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
        Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
      {
      uschar *newp = malloc(Ustrlen(EXIM_TMPDIR) + 8);
      sprintf(CS newp, "TMPDIR=%s", EXIM_TMPDIR);
      *p = newp;
      DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", EXIM_TMPDIR);
      }
    }
  }
- 

Return to bug 63420

Lines 3899-3918 if (log_oneline) Link Here

(-)a/src/exim.c (-7 / +6 lines)
3899	temporary files are created; Exim doesn't use these (apart from when delivering	3899	temporary files are created; Exim doesn't use these (apart from when delivering
3900	to MBX mailboxes), but called libraries such as DBM libraries may require them.	3900	to MBX mailboxes), but called libraries such as DBM libraries may require them.
3901	If TMPDIR is found in the environment, reset it to the value defined in the	3901	If TMPDIR is found in the environment, reset it to the value defined in the
3902	TMPDIR macro, if this macro is defined. */	3902	EXIM_TMPDIR macro, if this macro is defined. */
3903		3903
3904	#ifdef TMPDIR	3904	#ifdef EXIM_TMPDIR
3905	{	3905	{
3906	uschar **p;	3906	uschar **p;
3907	for (p = USS environ; *p != NULL; p++)	3907	for (p = USS environ; *p != NULL; p++)
3908	{	3908	{
3909	if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&	3909	if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
3910	Ustrcmp(*p+7, TMPDIR) != 0)	3910	Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
3911	{	3911	{
3912	uschar *newp = malloc(Ustrlen(TMPDIR) + 8);	3912	uschar *newp = malloc(Ustrlen(EXIM_TMPDIR) + 8);
3913	sprintf(CS newp, "TMPDIR=%s", TMPDIR);	3913	sprintf(CS newp, "TMPDIR=%s", EXIM_TMPDIR);
3914	*p = newp;	3914	*p = newp;
3915	DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", TMPDIR);	3915	DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", EXIM_TMPDIR);
3916	}	3916	}
3917	}	3917	}
3918	}	3918	}
3919	-