lib-program-client, global: Remove program_client_parameters.debug

Just inherit it from the parent event.

diff --git a/src/lib-program-client/program-client.c b/src/lib-program-client/program-client.c
index 59720b18cc22ccee717e3225e186ac4a03b2168d..6fd76e8e48a92dafe34a74d628c88957a0af528a 100644 (file)
--- a/src/lib-program-client/program-client.c
+++ b/src/lib-program-client/program-client.c
@@ -477,13 +477,11 @@ void program_client_init(struct program_client *pclient, pool_t pool,
                pclient->event = event_create(NULL);
        else {
                pclient->params = *params;
-               pclient->debug = params->debug;
                pclient->params.dns_client_socket_path =
                        p_strdup(pool, params->dns_client_socket_path);
                pclient->params.home = p_strdup(pool, params->home);
 
                pclient->event = event_create(params->event);
-               event_set_forced_debug(pclient->event, params->debug);
        }
 
        program_client_set_label(pclient, initial_label);

diff --git a/src/lib-program-client/program-client.h b/src/lib-program-client/program-client.h
index 7dcdb1488b8332ec9cc08a877e8cad6249344a13..d424c27425e90739323f9eb740d7943463cc15da 100644 (file)
--- a/src/lib-program-client/program-client.h
+++ b/src/lib-program-client/program-client.h
@@ -26,7 +26,6 @@ struct program_client_parameters {
        struct event *event;
 
        bool allow_root:1;
-       bool debug:1;
        bool drop_stderr:1;
        /* use o_stream_dot, which is mainly useful to make sure that an
           unexpectedly closed connection doesn't cause the partial input to

diff --git a/src/lib-program-client/test-program-client-local.c b/src/lib-program-client/test-program-client-local.c
index 6aaed792dbfc12bdc91465e0fd314f2e6dfd8662..b680819cd5bf84c3a4f322ad24b62ede0622d771 100644 (file)
--- a/src/lib-program-client/test-program-client-local.c
+++ b/src/lib-program-client/test-program-client-local.c
@@ -26,7 +26,6 @@ static const char *pclient_test_io_string =
 static struct program_client_parameters pc_params = {
        .client_connect_timeout_msecs = 10000,
        .input_idle_timeout_msecs = 5000,
-       .debug = FALSE,
        .restrict_set = {
                .uid = (uid_t)-1,
                .gid = (gid_t)-1,
@@ -268,10 +267,11 @@ int main(int argc, char *argv[])
 
        lib_init();
 
+       pc_params.event = event_create(NULL);
        while ((c = getopt(argc, argv, "D")) > 0) {
                switch (c) {
                case 'D':
-                       pc_params.debug = TRUE;
+                       event_set_forced_debug(pc_params.event, TRUE);
                        break;
                default:
                        i_fatal("Usage: %s [-D]", argv[0]);
@@ -284,6 +284,7 @@ int main(int argc, char *argv[])
        lib_signals_deinit();
        io_loop_destroy(&ioloop);
 
+       event_unref(&pc_params.event);
        lib_deinit();
        return ret;
 }

diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
index c7743ed176934f8326203c9602a205a0b5e5cbd9..b3d0114e4e27a402de5fa69d989ceca32e97d6bf 100644 (file)
--- a/src/lib-program-client/test-program-client-net.c
+++ b/src/lib-program-client/test-program-client-net.c
@@ -30,7 +30,6 @@ static const char *pclient_test_io_string =
 static struct program_client_parameters pc_params = {
        .client_connect_timeout_msecs = 5000,
        .input_idle_timeout_msecs = 10000,
-       .debug = FALSE,
 };
 
 static struct test_server {
@@ -530,10 +529,11 @@ int main(int argc, char *argv[])
 
        lib_init();
 
+       pc_params.event = event_create(NULL);
        while ((c = getopt(argc, argv, "D")) > 0) {
                switch (c) {
                case 'D':
-                       pc_params.debug = TRUE;
+                       event_set_forced_debug(pc_params.event, TRUE);
                        break;
                default:
                        i_fatal("Usage: %s [-D]", argv[0]);
@@ -542,6 +542,7 @@ int main(int argc, char *argv[])
 
        ret = test_run(tests);
 
+       event_unref(&pc_params.event);
        lib_deinit();
        return ret;
 }

diff --git a/src/lib-program-client/test-program-client-unix.c b/src/lib-program-client/test-program-client-unix.c
index e9a58bf4f6c286999ea3b9f162a57efb02c66276..94ba3700f097e4d9104d3c2d6b8142feb83fec1c 100644 (file)
--- a/src/lib-program-client/test-program-client-unix.c
+++ b/src/lib-program-client/test-program-client-unix.c
@@ -29,7 +29,6 @@ static const char *pclient_test_io_string =
 static struct program_client_parameters pc_params = {
        .client_connect_timeout_msecs = 1000,
        .input_idle_timeout_msecs = 5000,
-       .debug = FALSE,
 };
 
 static struct test_server {
@@ -478,10 +477,11 @@ int main(int argc, char *argv[])
 
        lib_init();
 
+       pc_params.event = event_create(NULL);
        while ((c = getopt(argc, argv, "D")) > 0) {
                switch (c) {
                case 'D':
-                       pc_params.debug = TRUE;
+                       event_set_forced_debug(pc_params.event, TRUE);
                        break;
                default:
                        i_fatal("Usage: %s [-D]", argv[0]);
@@ -490,6 +490,7 @@ int main(int argc, char *argv[])
 
        ret = test_run(tests);
 
+       event_unref(&pc_params.event);
        lib_deinit();
        return ret;
 }

diff --git a/src/lib-smtp/smtp-submit.c b/src/lib-smtp/smtp-submit.c
index 7537ed424dc549a3bdf189bc706ca1f608188be0..5b58c7da588816975bb5f4351fce7d30ae757a61 100644 (file)
--- a/src/lib-smtp/smtp-submit.c
+++ b/src/lib-smtp/smtp-submit.c
@@ -84,6 +84,7 @@ smtp_submit_session_init(const struct smtp_submit_input *input,
        session->allow_root = input->allow_root;
 
        session->event = event_create(input->event_parent);
+       event_set_forced_debug(session->event, set->mail_debug);
        event_add_category(session->event, &event_category_smtp_submit);
 
        return session;
@@ -412,8 +413,8 @@ smtp_submit_send_sendmail(struct smtp_submit *subm)
        i_zero(&pc_params);
        pc_params.client_connect_timeout_msecs = set->submission_timeout * 1000;
        pc_params.input_idle_timeout_msecs = set->submission_timeout * 1000;
-       pc_params.debug = set->mail_debug;
        pc_params.event = subm->event;
+
        pc_params.allow_root = subm->session->allow_root;
        restrict_access_init(&pc_params.restrict_set);
 

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 48f1e939161806fa60660c0f8a43bfdf968a50e1..aecc0d24d82fb1a22ac157ddbfbfc1b3619b69b1 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -1010,7 +1010,7 @@ static void quota_warning_execute(struct quota_root *root, const char *cmd,
 
        struct program_client_parameters params = {
                .client_connect_timeout_msecs = 1000,
-               .debug = event_want_debug(root->quota->event),
+               .event = root->quota->event,
        };
        struct program_client *pc;
 

diff --git a/src/plugins/welcome/welcome-plugin.c b/src/plugins/welcome/welcome-plugin.c
index 44f1c9b236d0ea7304e1ed06ce716d654506adb0..0b2fea8b744f26a6f7341b3ffba22816dad696e4 100644 (file)
--- a/src/plugins/welcome/welcome-plugin.c
+++ b/src/plugins/welcome/welcome-plugin.c
@@ -55,7 +55,6 @@ static void script_execute(struct mail_user *user, const char *cmd, bool wait)
        struct program_client_parameters params = {
                .client_connect_timeout_msecs = 1000,
                .event = user->event,
-               .debug = event_want_debug(user->event),
                .home = home,
        };