auth: Remove auth_request->debug

Use event_want_debug(auth_request->event) instead.

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 9acdc93301406c00a271837cb744c33d2270dc01..f2cd07a629f9fc9a3a8cfc67fe615a53668f3faf 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -107,7 +107,6 @@ static void auth_request_post_alloc_init(struct auth_request *request, struct ev
        request->last_access = ioloop_time;
        request->session_pid = (pid_t)-1;
        request->set = global_auth_settings;
-       request->debug = request->set->debug;
        request->extra_fields = auth_fields_init(request->pool);
        request->event = event_create(parent_event);
        request->mech_event = event_create(request->event);
@@ -172,9 +171,6 @@ void auth_request_init(struct auth_request *request)
 
        auth = auth_request_get_auth(request);
        request->set = auth->set;
-       /* NOTE: request->debug may already be TRUE here */
-       if (request->set->debug)
-               request->debug = TRUE;
        request->passdb = auth->passdbs;
        request->userdb = auth->userdbs;
 }
@@ -454,7 +450,7 @@ void auth_request_export(struct auth_request *request, string_t *dest)
        }
        if (request->session_id != NULL)
                str_printfa(dest, "\tsession=%s", request->session_id);
-       if (request->debug)
+       if (event_want_debug(request->event))
                str_append(dest, "\tdebug");
        switch(request->secured) {
        case AUTH_REQUEST_SECURED_NONE: break;
@@ -520,10 +516,9 @@ bool auth_request_import_info(struct auth_request *request,
                request->local_name = p_strdup(request->pool, value);
        else if (strcmp(key, "session") == 0)
                request->session_id = p_strdup(request->pool, value);
-       else if (strcmp(key, "debug") == 0) {
-               request->debug = TRUE;
+       else if (strcmp(key, "debug") == 0)
                event_set_forced_debug(request->event, TRUE);
-       } else if (strcmp(key, "client_id") == 0)
+       else if (strcmp(key, "client_id") == 0)
                request->client_id = p_strdup(request->pool, value);
        else if (strcmp(key, "forward_fields") == 0) {
                auth_fields_import_prefixed(request->extra_fields,

diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index 976f0ad714227711d9e652eeb6a74d243de0fa1c..8d85497382660b09ac3fd363b13bcf129b90ba14 100644 (file)
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -117,8 +117,6 @@ struct auth_request {
        bool userdb_lookup:1;
        /* DIGEST-MD5 kludge */
        bool domain_is_realm:1;
-       /* auth_debug is enabled for this request */
-       bool debug:1;
 
        enum auth_request_secured secured;
 

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 7b2d3201607d0f60c7eab504acb972818d93ce92..0a377ca014f534a0e5553315e1f46fa73e7d08bd 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1592,7 +1592,7 @@ db_ldap_result_iterate_init_full(struct ldap_connection *conn,
        ctx->iter_dn_values = iter_dn_values;
        hash_table_create(&ctx->ldap_attrs, pool, 0, strcase_hash, strcasecmp);
        ctx->var = str_new(ctx->pool, 256);
-       if (ctx->ldap_request->auth_request->debug)
+       if (event_want_debug(ctx->ldap_request->auth_request->event))
                ctx->debug = t_str_new(256);
        ctx->ldap_msg = res;
        ctx->ld = conn->ld;

diff --git a/src/auth/passdb-imap.c b/src/auth/passdb-imap.c
index a2d16aef5625dcd954bf9368ec7b0f27166d8b57..d4911c6edaa24e695f7e55594a74f3366c2cc138 100644 (file)
--- a/src/auth/passdb-imap.c
+++ b/src/auth/passdb-imap.c
@@ -91,7 +91,7 @@ passdb_imap_verify_plain(struct auth_request *auth_request,
        string_t *str;
 
        set = module->set;
-       set.debug = auth_request->debug;
+       set.debug = event_want_debug(auth_request->event);
        set.dns_client_socket_path =
                t_strconcat(auth_request->set->base_dir, "/",
                            DNS_CLIENT_SOCKET_NAME, NULL);

diff --git a/src/auth/test-lua.c b/src/auth/test-lua.c
index e2fc9a5f41192bba9248821d4f230ddfb61528f9..cabb2bb77cc1597fdf797af789166a3ee65d817b 100644 (file)
--- a/src/auth/test-lua.c
+++ b/src/auth/test-lua.c
@@ -19,7 +19,6 @@ static void test_db_lua_auth_verify(void)
        struct event *event = event_create(req->event);
        array_push_back(&req->authdb_event, &event);
        req->passdb = passdb_mock();
-       req->debug = TRUE;
        req->user = "testuser";
 
        static const char *luascript =
@@ -64,7 +63,6 @@ static void test_db_lua_auth_lookup_numberish_value(void)
        struct event *event = event_create(req->event);
        array_push_back(&req->authdb_event, &event);
        req->passdb = passdb_mock();
-       req->debug = TRUE;
        req->user = "testuser";
 
        static const char *luascript =
@@ -108,7 +106,6 @@ static void test_db_lua_auth_lookup(void)
        struct event *event = event_create(req->event);
        array_push_back(&req->authdb_event, &event);
        req->passdb = passdb_mock();
-       req->debug = TRUE;
        req->user = "testuser";
 
        static const char *luascript =