lib-master: Always import systemd related variables with systemd

Otherwise it is too easy to break systemd integration by forgetting
these from import_environment.

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 90ca40f744ee1bfcb9887711de36f750f57dd048..8e39d2e7fbf6731e1de7286a7cfe3d77e5768aef 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -709,6 +709,12 @@ static void master_service_import_environment_real(const char *import_environmen
        value = getenv(DOVECOT_PRESERVE_ENVS_ENV);
        if (value != NULL)
                array_push_back(&keys, &value);
+#ifdef HAVE_LIBSYSTEMD
+       /* Always import systemd variables, otherwise it is possible to break
+          systemd startup in obscure ways. */
+       value = "NOTIFY_SOCKET LISTEN_FDS LISTEN_PID";
+       array_push_back(&keys, &value);
+#endif
        /* add new environments */
        envs = t_strsplit_spaces(import_environment, " ");
        for (; *envs != NULL; envs++) {