auth: userdb iteration - Use event based logging

diff --git a/src/auth/userdb-dict.c b/src/auth/userdb-dict.c
index 5b35a538611ffc8f1ae79b10306fdc139dcb6f32..391b6998c9f7252d841b467baf3b433e09fffafc 100644 (file)
--- a/src/auth/userdb-dict.c
+++ b/src/auth/userdb-dict.c
@@ -152,7 +152,8 @@ static int userdb_dict_iterate_deinit(struct userdb_iterate_context *_ctx)
        int ret = _ctx->failed ? -1 : 0;
 
        if (dict_iterate_deinit(&ctx->iter, &error) < 0) {
-               i_error("dict_iterate(%s) failed: %s",
+               e_error(authdb_event(_ctx->auth_request),
+                       "dict_iterate(%s) failed: %s",
                        ctx->key_prefix, error);
                ret = -1;
        }

diff --git a/src/auth/userdb-passwd-file.c b/src/auth/userdb-passwd-file.c
index 2aa5a7d45595563ed6713f89fc7d17908a78b879..1e87138edcc64128646bfd17448f50dea07a4046 100644 (file)
--- a/src/auth/userdb-passwd-file.c
+++ b/src/auth/userdb-passwd-file.c
@@ -116,7 +116,8 @@ passwd_file_iterate_init(struct auth_request *auth_request,
        ctx->ctx.context = context;
        ctx->skip_passdb_entries = !module->pwf->userdb_warn_missing;
        if (module->pwf->default_file == NULL) {
-               i_error("passwd-file: User iteration isn't currently supported "
+               e_error(authdb_event(auth_request),
+                       "passwd-file: User iteration isn't currently supported "
                        "with %%variable paths");
                ctx->ctx.failed = TRUE;
                return &ctx->ctx;
@@ -126,7 +127,8 @@ passwd_file_iterate_init(struct auth_request *auth_request,
        /* for now we support only a single passwd-file */
        fd = open(ctx->path, O_RDONLY);
        if (fd == -1) {
-               i_error("open(%s) failed: %m", ctx->path);
+               e_error(authdb_event(auth_request),
+                       "open(%s) failed: %m", ctx->path);
                ctx->ctx.failed = TRUE;
        } else {
                ctx->input = i_stream_create_fd_autoclose(&fd, SIZE_MAX);
@@ -155,7 +157,8 @@ static void passwd_file_iterate_next(struct userdb_iterate_context *_ctx)
                        break;
                }
                if (line == NULL && ctx->input->stream_errno != 0) {
-                       i_error("read(%s) failed: %s", ctx->path,
+                       e_error(authdb_event(_ctx->auth_request),
+                               "read(%s) failed: %s", ctx->path,
                                i_stream_get_error(ctx->input));
                        _ctx->failed = TRUE;
                }

diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index 70b9969f620780ee54b5665e34a465a0f2303a17..609445e474ae16b4ab26da4e38efeea56aad1f91 100644 (file)
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -182,7 +182,8 @@ static void passwd_iterate_next(struct userdb_iterate_context *_ctx)
                errno = 0;
        }
        if (errno != 0) {
-               i_error("getpwent() failed: %m");
+               e_error(authdb_event(_ctx->auth_request),
+                       "getpwent() failed: %m");
                _ctx->failed = TRUE;
        }
        _ctx->callback(NULL, _ctx->context);

diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index c69832a629952f1a892b83f9f8bc92b22de0c78c..3a8764046bcb168529a7c006de1e25b7a747bac8 100644 (file)
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -220,9 +220,11 @@ static void userdb_sql_iterate_next(struct userdb_iterate_context *_ctx)
                db_sql_success(module->conn);
        if (ret > 0) {
                if (userdb_sql_iterate_get_user(ctx, &user) < 0)
-                       i_error("sql: Iterate query didn't return 'user' field");
+                       e_error(authdb_event(_ctx->auth_request),
+                               "sql: Iterate query didn't return 'user' field");
                else if (user == NULL)
-                       i_error("sql: Iterate query returned NULL user");
+                       e_error(authdb_event(_ctx->auth_request),
+                               "sql: Iterate query returned NULL user");
                else {
                        _ctx->callback(user, _ctx->context);
                        return;
@@ -230,10 +232,12 @@ static void userdb_sql_iterate_next(struct userdb_iterate_context *_ctx)
                _ctx->failed = TRUE;
        } else if (ret < 0) {
                if (!module->conn->default_iterate_query) {
-                       i_error("sql: Iterate query failed: %s",
+                       e_error(authdb_event(_ctx->auth_request),
+                               "sql: Iterate query failed: %s",
                                sql_result_get_error(ctx->result));
                } else {
-                       i_error("sql: Iterate query failed: %s "
+                       e_error(authdb_event(_ctx->auth_request),
+                               "sql: Iterate query failed: %s "
                                "(using built-in default iterate_query: %s)",
                                sql_result_get_error(ctx->result),
                                module->conn->set.iterate_query);