Import Debian changes 4.89-2+deb9u4

[hcoop/debian/exim4.git] / debian / patches / 89_01_p_Delay-chdir-until-we-opened-the-main-config.patch

diff --git a/debian/patches/89_01_p_Delay-chdir-until-we-opened-the-main-config.patch b/debian/patches/89_01_p_Delay-chdir-until-we-opened-the-main-config.patch
deleted file mode 100644 (file)
index b55e90c..0000000
--- a/debian/patches/89_01_p_Delay-chdir-until-we-opened-the-main-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Backport of 3de973a29de6852d61ba9bf1845835d08ca5a5ab
-
-From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
-Date: Wed, 2 Mar 2016 22:07:45 +0100
-Subject: [PATCH] Delay chdir(/) until we opened the main config
-
---- a/doc/spec.txt
-+++ b/doc/spec.txt
-@@ -3361,8 +3361,6 @@ brief message about itself and exits.
-     first file that exists is used. Failure to open an existing file stops Exim
-     from proceeding any further along the list, and an error is generated.
- 
--    The file names need to be absolute names.
--
-     When this option is used by a caller other than root, and the list is
-     different from the compiled-in list, Exim gives up its root privilege
-     immediately, and runs with the real and effective uid and gid set to those
---- a/src/exim.c
-+++ b/src/exim.c
-@@ -3683,17 +3683,16 @@ init_lookup_list();
- 
- /* Read the main runtime configuration data; this gives up if there
- is a failure. It leaves the configuration file open so that the subsequent
--configuration data for delivery can be read if needed. */
-+configuration data for delivery can be read if needed.
- 
--/* To be safe: change the working directory to /. */
--if (Uchdir("/") < 0)
--  {
--    perror("exim: chdir `/': ");
--    exit(EXIT_FAILURE);
--  }
-+NOTE: immediatly after opening the configuration file we change the working
-+directory to "/"! Later we change to $spool_directory. We do it there, because
-+during readconf_main() some expansion takes place already. */
- 
- readconf_main();
- 
-+/* Now in directory "/" */
-+
- if (cleanup_environment() == FALSE)
-   log_write(0, LOG_PANIC_DIE, "Can't cleanup environment");
- 
---- a/src/readconf.c
-+++ b/src/readconf.c
-@@ -2969,14 +2969,6 @@ while((filename = string_nextinlist(&lis
-        != NULL)
-   {
- 
--  /* To avoid confusion: Exim changes to / at the very beginning and
--   * and to $spool_directory later. */
--  if (filename[0] != '/')
--    {
--    fprintf(stderr, "-C %s: only absolute names are allowed\n", filename);
--    exit(EXIT_FAILURE);
--  }
--
-   /* Cut out all the fancy processing unless specifically wanted */
- 
-   #if defined(CONFIGURE_FILE_USE_NODE) || defined(CONFIGURE_FILE_USE_EUID)
-@@ -3030,6 +3022,15 @@ while((filename = string_nextinlist(&lis
-   if (config_file != NULL || errno != ENOENT) break;
-   }
- 
-+/* Now, once we found and opened our configuration file, we change the directory
-+to a safe place. Later we change to $spool_directory. */
-+
-+if (Uchdir("/") < 0)
-+  {
-+  perror("exim: chdir `/': ");
-+  exit(EXIT_FAILURE);
-+  }
-+
- /* On success, save the name for verification; config_filename is used when
- logging configuration errors (it changes for .included files) whereas
- config_main_filename is the name shown by -bP. Failure to open a configuration