Logging: for callout errors likely to be config problems, include the transport in...

[exim.git] / src / src / directory.c

diff --git a/src/src/directory.c b/src/src/directory.c
index 2d4d565f4ede31504743571a5b1ded263d0ebc42..94303db0bdc244c205f7a22bcb5c835c197ba579 100644 (file)
--- a/src/src/directory.c
+++ b/src/src/directory.c
@@ -2,9 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

+/* Copyright (c) The Exim Maintainers 2010 - 2022 */

 /* Copyright (c) University of Cambridge 1995 - 2009 */
 /* Copyright (c) University of Cambridge 1995 - 2009 */

-/* Copyright (c) The Exim Maintainers 2010 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 /* See the file NOTICE for conditions of use and distribution. */

+/* SPDX-License-Identifier: GPL-2.0-or-later */

 
 #include "exim.h"
 
 
 #include "exim.h"
 


@@ -44,6 +45,9 @@ uschar c = 1;
 struct stat statbuf;
 uschar * path;
 
 struct stat statbuf;
 uschar * path;
 

+if (is_tainted(name)) 
+  { p = US"create"; path = US name; errno = ERRNO_TAINT; goto bad; }
+

 if (parent)
   {
   path = string_sprintf("%s%s%s", parent, US"/", name);
 if (parent)
   {
   path = string_sprintf("%s%s%s", parent, US"/", name);


@@ -85,7 +89,7 @@ return TRUE;
 
 bad:
   if (panic) log_write(0, LOG_MAIN|LOG_PANIC_DIE,
 
 bad:
   if (panic) log_write(0, LOG_MAIN|LOG_PANIC_DIE,

-    "Failed to %s directory \"%s\": %s\n", p, path, strerror(errno));
+    "Failed to %s directory \"%s\": %s\n", p, path, exim_errstr(errno));

   return FALSE;
 }
 
   return FALSE;
 }