master: If mail_debug=yes, set DEBUG=1 environment to auth-destination processes.

--HG--
branch : HEAD

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 014fdc64829476e4235fa0b1a88bca26e6890fff..f51771fa518b7ea362cdcbc1c1f70de91d66a004 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -190,6 +190,7 @@ static struct setting_define master_setting_defines[] = {
        DEF(SET_UINT, default_client_limit),
 
        DEF(SET_BOOL, version_ignore),
+       DEF(SET_BOOL, mail_debug),
 
        DEF(SET_UINT, first_valid_uid),
        DEF(SET_UINT, last_valid_uid),
@@ -209,6 +210,7 @@ static struct master_settings master_default_settings = {
        MEMBER(default_client_limit) 1000,
 
        MEMBER(version_ignore) FALSE,
+       MEMBER(mail_debug) FALSE,
 
        MEMBER(first_valid_uid) 500,
        MEMBER(last_valid_uid) 0,

diff --git a/src/master/master-settings.h b/src/master/master-settings.h
index 403807feba9549ae7dff46c64889d2a2c4bff8c2..8ee35532753647027b3147b8f94580a9ba55b9e4 100644 (file)
--- a/src/master/master-settings.h
+++ b/src/master/master-settings.h
@@ -50,6 +50,7 @@ struct master_settings {
        unsigned int default_client_limit;
 
        bool version_ignore;
+       bool mail_debug;
 
        unsigned int first_valid_uid, last_valid_uid;
        unsigned int first_valid_gid, last_valid_gid;

diff --git a/src/master/service-process.c b/src/master/service-process.c
index acddc2ab191b3fa824468b611812465c139f86fb..8ebdb67f61a7f36f289285baa08ad83b99e1b9d3 100644 (file)
--- a/src/master/service-process.c
+++ b/src/master/service-process.c
@@ -243,6 +243,9 @@ static void drop_privileges(struct service *service,
        const char *user, *home = NULL;
        bool disallow_root;
 
+       if (auth_args != NULL && service->set->master_set->mail_debug)
+               env_put("DEBUG=1");
+
        restrict_access_init(&rset);
        rset.uid = service->uid;
        rset.gid = service->gid;