Log debug-level messages with i_debug().

--HG--
branch : HEAD

diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c
index df3692e1018df5260e04301c82f34a36b7e85e8b..86a6e8409d4b3167efac3bcf5ebbf2ce88fed1df 100644 (file)
--- a/src/auth/auth-client-connection.c
+++ b/src/auth/auth-client-connection.c
@@ -64,8 +64,8 @@ static void auth_client_send(struct auth_client_connection *conn,
        }
 
        if (conn->auth->set->debug) {
-               i_info("client out: %s", conn->auth->set->debug_passwords ?
-                      cmd : reply_line_hide_pass(cmd));
+               i_debug("client out: %s", conn->auth->set->debug_passwords ?
+                       cmd : reply_line_hide_pass(cmd));
        }
 }
 
@@ -123,7 +123,7 @@ auth_client_input_cpid(struct auth_client_connection *conn, const char *args)
 
        conn->pid = pid;
        if (conn->auth->set->debug)
-               i_info("new auth connection: pid=%u", conn->pid);
+               i_debug("new auth connection: pid=%u", conn->pid);
        return TRUE;
 }
 
@@ -172,18 +172,18 @@ auth_client_handle_line(struct auth_client_connection *conn, const char *line)
 {
        if (strncmp(line, "AUTH\t", 5) == 0) {
                if (conn->auth->set->debug) {
-                       i_info("client in: %s",
-                              conn->auth->set->debug_passwords ? line :
-                              auth_line_hide_pass(line));
+                       i_debug("client in: %s",
+                               conn->auth->set->debug_passwords ? line :
+                               auth_line_hide_pass(line));
                }
                return auth_request_handler_auth_begin(conn->request_handler,
                                                       line + 5);
        }
        if (strncmp(line, "CONT\t", 5) == 0) {
                if (conn->auth->set->debug) {
-                       i_info("client in: %s",
-                              conn->auth->set->debug_passwords ? line :
-                              cont_line_hide_pass(line));
+                       i_debug("client in: %s",
+                               conn->auth->set->debug_passwords ? line :
+                               cont_line_hide_pass(line));
                }
                return auth_request_handler_auth_continue(conn->request_handler,
                                                          line + 5);

diff --git a/src/auth/auth-master-connection.c b/src/auth/auth-master-connection.c
index 1ba468a162beeea475f73caa2dcb8de3211316a3..4c3f6992a29dc1929b8b568f53040efdf220915c 100644 (file)
--- a/src/auth/auth-master-connection.c
+++ b/src/auth/auth-master-connection.c
@@ -54,7 +54,7 @@ void auth_master_request_callback(struct auth_stream_reply *reply,
        reply_str = auth_stream_reply_export(reply);
 
        if (conn->auth->set->debug)
-               i_info("master out: %s", reply_str);
+               i_debug("master out: %s", reply_str);
 
        iov[0].iov_base = reply_str;
        iov[0].iov_len = strlen(reply_str);
@@ -181,7 +181,7 @@ user_callback(enum userdb_result result,
        }
 
        if (conn->auth->set->debug)
-               i_info("master out: %s", str_c(str));
+               i_debug("master out: %s", str_c(str));
 
        str_append_c(str, '\n');
        (void)o_stream_send(conn->output, str_data(str), str_len(str));
@@ -240,7 +240,7 @@ pass_callback(enum passdb_result result,
        }
 
        if (conn->auth->set->debug)
-               i_info("master out: %s", str_c(str));
+               i_debug("master out: %s", str_c(str));
 
        str_append_c(str, '\n');
        (void)o_stream_send(conn->output, str_data(str), str_len(str));
@@ -381,7 +381,7 @@ static bool
 auth_master_input_line(struct auth_master_connection *conn, const char *line)
 {
        if (conn->auth->set->debug)
-               i_info("master in: %s", line);
+               i_debug("master in: %s", line);
 
        if (strncmp(line, "USER\t", 5) == 0)
                return master_input_user(conn, line + 5);

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 093578bebbeeb19a46a84cb4ead03060da8378f8..3343d7939a7eebd3a6c75a581ae33e763b122c89 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1449,7 +1449,7 @@ void auth_request_log_debug(struct auth_request *auth_request,
 
        va_start(va, format);
        T_BEGIN {
-               i_info("%s", get_log_str(auth_request, subsystem, format, va));
+               i_debug("%s", get_log_str(auth_request, subsystem, format, va));
        } T_END;
        va_end(va);
 }

diff --git a/src/auth/db-passwd-file.c b/src/auth/db-passwd-file.c
index 9d228cfe437a09c8e4c3af40e0c11db7bd2254e4..113fb8aa5071bd0c1d4d506c0b64aa427ca34c02 100644 (file)
--- a/src/auth/db-passwd-file.c
+++ b/src/auth/db-passwd-file.c
@@ -202,8 +202,8 @@ static bool passwd_file_open(struct passwd_file *pw)
        i_stream_destroy(&input);
 
        if (pw->db->debug) {
-               i_info("passwd-file %s: Read %u users",
-                      pw->path, hash_table_count(pw->users));
+               i_debug("passwd-file %s: Read %u users",
+                       pw->path, hash_table_count(pw->users));
        }
        return TRUE;
 }

diff --git a/src/auth/passdb.c b/src/auth/passdb.c
index 1958e983e82a502cccc6f4431ad54daf59b01806..b4d93ceda8c1c38a43a997e6667bdc8992e26667 100644 (file)
--- a/src/auth/passdb.c
+++ b/src/auth/passdb.c
@@ -113,7 +113,7 @@ bool passdb_get_credentials(struct auth_request *auth_request,
                                               auth_request->realm, NULL);
                }
                if (auth_request->auth->set->debug_passwords) {
-                       auth_request_log_info(auth_request, "password",
+                       auth_request_log_debug(auth_request, "password",
                                "Generating %s from user '%s', password '%s'",
                                wanted_scheme, username, plaintext);
                }

diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 1ba89a042c175bf6244d07f8984ddae1f9ef2e64..d04dcb71e2c1dfd30a4a41c1aba542b02f9c45c3 100644 (file)
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -201,10 +201,10 @@ userdb_ldap_iterate_init(struct auth_userdb *userdb,
        request->request.attributes = conn->iterate_attr_names;
 
        if (userdb->auth->set->debug) {
-               i_info("ldap: iterate: base=%s scope=%s filter=%s fields=%s",
-                      conn->set.base, conn->set.scope, request->request.filter,
-                      attr_names == NULL ? "(all)" :
-                      t_strarray_join(attr_names, ","));
+               i_debug("ldap: iterate: base=%s scope=%s filter=%s fields=%s",
+                       conn->set.base, conn->set.scope,
+                       request->request.filter, attr_names == NULL ? "(all)" :
+                       t_strarray_join(attr_names, ","));
        }
        request->request.request.callback = userdb_ldap_iterate_callback;
        db_ldap_request(conn, &request->request.request);

diff --git a/src/auth/userdb-prefetch.c b/src/auth/userdb-prefetch.c
index 6d9725e3c379efa8a3f53886f0a9f38f695a2e3e..4d70bea9884390703271aa13be16ff0e78095103 100644 (file)
--- a/src/auth/userdb-prefetch.c
+++ b/src/auth/userdb-prefetch.c
@@ -28,7 +28,7 @@ static void prefetch_lookup(struct auth_request *auth_request,
                } else if (!auth_request->userdb_lookup ||
                           auth_request->auth->set->debug) {
                        /* more userdbs, they may know the user */
-                       auth_request_log_info(auth_request, "prefetch",
+                       auth_request_log_debug(auth_request, "prefetch",
                                "passdb didn't return userdb entries, "
                                "trying the next userdb");
                }

diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c
index 232ea8fccb3a410b2a279781567fdf38c670c6df..c4864aa81fa49ea01fdd9b1eb752d6294373d87a 100644 (file)
--- a/src/lib-auth/auth-master.c
+++ b/src/lib-auth/auth-master.c
@@ -130,7 +130,7 @@ static void auth_parse_input(struct auth_master_user_lookup_ctx *ctx,
        reply->user = p_strdup(ctx->pool, *args);
        for (args++; *args != NULL; args++) {
                if (ctx->conn->debug)
-                       i_info("auth input: %s", *args);
+                       i_debug("auth input: %s", *args);
 
                if (strncmp(*args, "uid=", 4) == 0)
                        reply->uid = strtoul(*args + 4, NULL, 10);

diff --git a/src/lib-auth/auth-server-connection.c b/src/lib-auth/auth-server-connection.c
index d2f2f32c4201afeb5bc64837d73e96af27ea7a9a..2e3c3653e6012ea3785ee9d75340159910acf676 100644 (file)
--- a/src/lib-auth/auth-server-connection.c
+++ b/src/lib-auth/auth-server-connection.c
@@ -202,7 +202,7 @@ auth_server_connection_input_line(struct auth_server_connection *conn,
        const char *const *args;
 
        if (conn->client->debug)
-               i_info("auth input: %s", line);
+               i_debug("auth input: %s", line);
 
        args = t_strsplit(line, "\t");
        if (strcmp(args[0], "OK") == 0)

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index e29c97cc02b5859128fe292856bf4c6ed54dfbcc..45a60b31db2f9889d3b25cbb66b1d492560abcdb 100644 (file)
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -83,8 +83,8 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
     }
 
     if (mailbox_get_settings(mail->box)->mail_debug) {
-           i_info("Sending a rejection to %s: %s", recipient,
-                  str_sanitize(reason, 512));
+           i_debug("Sending a rejection to %s: %s", recipient,
+                   str_sanitize(reason, 512));
     }
 
     smtp_client = smtp_client_open(ctx->set, return_addr, NULL, &f);
@@ -188,8 +188,8 @@ int mail_send_forward(struct mail_deliver_context *ctx, const char *forwardto)
 
     return_path = mail_deliver_get_return_address(ctx);
     if (mailbox_get_settings(ctx->src_mail->box)->mail_debug) {
-           i_info("Sending a forward to <%s> with return path <%s>",
-                  forwardto, return_path);
+           i_debug("Sending a forward to <%s> with return path <%s>",
+                   forwardto, return_path);
     }
 
     smtp_client = smtp_client_open(ctx->set, forwardto, return_path, &f);

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 35d81ef9d4023d6d90f8e2c0b1ad6f313e2913f2..5c50b61cff6ea502e026db5e3aaf0d3f3798dfe0 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -165,17 +165,17 @@ maildir_storage_find_root_dir(const struct mail_namespace *ns)
                path = t_strconcat(home, "/Maildir", NULL);
                if (access(path, R_OK|W_OK|X_OK) == 0) {
                        if (debug)
-                               i_info("maildir: root exists (%s)", path);
+                               i_debug("maildir: root exists (%s)", path);
                        return path;
                } 
                if (debug)
-                       i_info("maildir: access(%s, rwx): failed: %m", path);
+                       i_debug("maildir: access(%s, rwx): failed: %m", path);
        } else {
                if (debug)
-                       i_info("maildir: Home directory not set");
+                       i_debug("maildir: Home directory not set");
                if (access("/cur", R_OK|W_OK|X_OK) == 0) {
                        if (debug)
-                               i_info("maildir: /cur exists, assuming chroot");
+                               i_debug("maildir: /cur exists, assuming chroot");
                        return "/";
                }
        }
@@ -195,7 +195,7 @@ static bool maildir_storage_autodetect(const struct mail_namespace *ns,
                root_dir = maildir_storage_find_root_dir(ns);
                if (root_dir == NULL) {
                        if (debug)
-                               i_info("maildir: couldn't find root dir");
+                               i_debug("maildir: couldn't find root dir");
                        return FALSE;
                }
        }
@@ -203,13 +203,13 @@ static bool maildir_storage_autodetect(const struct mail_namespace *ns,
        path = t_strconcat(root_dir, "/cur", NULL);
        if (stat(path, &st) < 0) {
                if (debug)
-                       i_info("maildir autodetect: stat(%s) failed: %m", path);
+                       i_debug("maildir autodetect: stat(%s) failed: %m", path);
                return FALSE;
        }
 
        if (!S_ISDIR(st.st_mode)) {
                if (debug)
-                       i_info("maildir autodetect: %s not a directory", path);
+                       i_debug("maildir autodetect: %s not a directory", path);
                return FALSE;
        }
 

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index a739f8545b8319134517023e78ef3cc7ebdd0cfe..da460bbec962d54ad1c20cbe40c2aef08164e41c 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -152,7 +152,7 @@ static void mbox_storage_get_list_settings(const struct mail_namespace *ns,
        if (set->inbox_path == NULL) {
                set->inbox_path = t_strconcat(set->root_dir, "/inbox", NULL);
                if (ns->mail_set->mail_debug)
-                       i_info("mbox: INBOX defaulted to %s", set->inbox_path);
+                       i_debug("mbox: INBOX defaulted to %s", set->inbox_path);
        }
 }
 
@@ -162,28 +162,28 @@ static bool mbox_is_file(const char *path, const char *name, bool debug)
 
        if (stat(path, &st) < 0) {
                if (debug) {
-                       i_info("mbox autodetect: %s: stat(%s) failed: %m",
-                              name, path);
+                       i_debug("mbox autodetect: %s: stat(%s) failed: %m",
+                               name, path);
                }
                return FALSE;
        }
        if (S_ISDIR(st.st_mode)) {
                if (debug) {
-                       i_info("mbox autodetect: %s: is a directory (%s)",
+                       i_debug("mbox autodetect: %s: is a directory (%s)",
                               name, path);
                }
                return FALSE;
        }
        if (access(path, R_OK|W_OK) < 0) {
                if (debug) {
-                       i_info("mbox autodetect: %s: no R/W access (%s)",
+                       i_debug("mbox autodetect: %s: no R/W access (%s)",
                               name, path);
                }
                return FALSE;
        }
 
        if (debug)
-               i_info("mbox autodetect: %s: yes (%s)", name, path);
+               i_debug("mbox autodetect: %s: yes (%s)", name, path);
        return TRUE;
 }
 
@@ -193,28 +193,28 @@ static bool mbox_is_dir(const char *path, const char *name, bool debug)
 
        if (stat(path, &st) < 0) {
                if (debug) {
-                       i_info("mbox autodetect: %s: stat(%s) failed: %m",
+                       i_debug("mbox autodetect: %s: stat(%s) failed: %m",
                               name, path);
                }
                return FALSE;
        }
        if (!S_ISDIR(st.st_mode)) {
                if (debug) {
-                       i_info("mbox autodetect: %s: is not a directory (%s)",
+                       i_debug("mbox autodetect: %s: is not a directory (%s)",
                               name, path);
                }
                return FALSE;
        }
        if (access(path, R_OK|W_OK|X_OK) < 0) {
                if (debug) {
-                       i_info("mbox autodetect: %s: no R/W/X access (%s)",
+                       i_debug("mbox autodetect: %s: no R/W/X access (%s)",
                               name, path);
                }
                return FALSE;
        }
 
        if (debug)
-               i_info("mbox autodetect: %s: yes (%s)", name, path);
+               i_debug("mbox autodetect: %s: yes (%s)", name, path);
        return TRUE;
 }
 
@@ -237,7 +237,7 @@ static const char *mbox_storage_find_root_dir(const struct mail_namespace *ns)
 
        if (mail_user_get_home(ns->user, &home) <= 0) {
                if (debug)
-                       i_info("maildir: Home directory not set");
+                       i_debug("maildir: Home directory not set");
                home = "";
        }
 
@@ -259,20 +259,20 @@ mbox_storage_find_inbox_file(const char *user, bool debug)
        path = t_strconcat("/var/mail/", user, NULL);
        if (access(path, R_OK|W_OK) == 0) {
                if (debug)
-                       i_info("mbox: INBOX exists (%s)", path);
+                       i_debug("mbox: INBOX exists (%s)", path);
                return path;
        }
        if (debug)
-               i_info("mbox: INBOX: access(%s, rw) failed: %m", path);
+               i_debug("mbox: INBOX: access(%s, rw) failed: %m", path);
 
        path = t_strconcat("/var/spool/mail/", user, NULL);
        if (access(path, R_OK|W_OK) == 0) {
                if (debug)
-                       i_info("mbox: INBOX exists (%s)", path);
+                       i_debug("mbox: INBOX exists (%s)", path);
                return path;
        }
        if (debug)
-               i_info("mbox: INBOX: access(%s, rw) failed: %m", path);
+               i_debug("mbox: INBOX: access(%s, rw) failed: %m", path);
        return NULL;
 }
 
@@ -298,7 +298,7 @@ static bool mbox_storage_autodetect(const struct mail_namespace *ns,
                root_dir = mbox_storage_find_root_dir(ns);
                if (root_dir == NULL) {
                        if (debug)
-                               i_info("mbox: couldn't find root dir");
+                               i_debug("mbox: couldn't find root dir");
                        return FALSE;
                }
        }

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index 71423056b2b714c8215e2dbb59b8723a64cd2657..989324a3a80647c1dbeba9ab03f51961996cba79 100644 (file)
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -102,14 +102,14 @@ namespace_add(struct mail_user *user,
                ns->flags |= NAMESPACE_FLAG_SUBSCRIPTIONS;
 
        if (mail_set->mail_debug) {
-               i_info("Namespace: type=%s, prefix=%s, sep=%s, "
-                      "inbox=%s, hidden=%s, list=%s, subscriptions=%s",
-                      ns_set->type, ns_set->prefix,
-                      ns_set->separator == NULL ? "" : ns_set->separator,
-                      ns_set->inbox ? "yes" : "no",
-                      ns_set->hidden ? "yes" : "no",
-                      ns_set->list ? "yes" : "no",
-                      ns_set->subscriptions ? "yes" : "no");
+               i_debug("Namespace: type=%s, prefix=%s, sep=%s, "
+                       "inbox=%s, hidden=%s, list=%s, subscriptions=%s",
+                       ns_set->type, ns_set->prefix,
+                       ns_set->separator == NULL ? "" : ns_set->separator,
+                       ns_set->inbox ? "yes" : "no",
+                       ns_set->hidden ? "yes" : "no",
+                       ns_set->list ? "yes" : "no",
+                       ns_set->subscriptions ? "yes" : "no");
        }
 
        if (*ns_set->location == '\0')

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index e08ebc4cc4c77a78988ca035f1fe3d6effa36729..94fec2b3469121bbab0fdd75346341b201d1c9ac 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -188,7 +188,7 @@ service_auth_userdb_lookup(struct auth_master_connection *conn,
 
        if (ret > 0 && strcmp(*user, orig_user) != 0) {
                if (mail_user_set_get_storage_set(user_set)->mail_debug)
-                       i_info("changed username to %s", *user);
+                       i_debug("changed username to %s", *user);
        }
 
        pool_unref(&pool);
@@ -363,9 +363,9 @@ mail_storage_service_init_post(struct master_service *service,
        mail_set = mail_user_set_get_storage_set(user_set);
 
        if (mail_set->mail_debug) {
-               i_info("Effective uid=%s, gid=%s, home=%s",
-                      dec2str(geteuid()), dec2str(getegid()),
-                      home != NULL ? home : "(none)");
+               i_debug("Effective uid=%s, gid=%s, home=%s",
+                       dec2str(geteuid()), dec2str(getegid()),
+                       home != NULL ? home : "(none)");
        }
 
        if (setuid_root) {
@@ -380,7 +380,7 @@ mail_storage_service_init_post(struct master_service *service,
                        if (errno != ENOENT)
                                i_error("chdir(%s) failed: %m", home);
                        else if (mail_set->mail_debug)
-                               i_info("Home dir not found: %s", home);
+                               i_debug("Home dir not found: %s", home);
                }
        }
 

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index c0358382d291fd8d5fc9bcde5860aa3f7b5d633e..a4699c40f3b6701804f0671c27cd9a2d843ba900 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -158,14 +158,14 @@ int mailbox_list_create(const char *driver, struct mail_namespace *ns,
        }
 
        if (ns->mail_set->mail_debug) {
-               i_info("%s: root=%s, index=%s, control=%s, inbox=%s",
-                      list->name,
-                      list->set.root_dir == NULL ? "" : list->set.root_dir,
-                      list->set.index_dir == NULL ? "" : list->set.index_dir,
-                      list->set.control_dir == NULL ?
-                      "" : list->set.control_dir,
-                      list->set.inbox_path == NULL ?
-                      "" : list->set.inbox_path);
+               i_debug("%s: root=%s, index=%s, control=%s, inbox=%s",
+                       list->name,
+                       list->set.root_dir == NULL ? "" : list->set.root_dir,
+                       list->set.index_dir == NULL ? "" : list->set.index_dir,
+                       list->set.control_dir == NULL ?
+                       "" : list->set.control_dir,
+                       list->set.inbox_path == NULL ?
+                       "" : list->set.inbox_path);
        }
 
        mail_namespace_finish_list_init(ns, list);
@@ -367,7 +367,7 @@ mailbox_list_get_permissions_full(struct mailbox_list *list, const char *name,
                        mailbox_list_set_critical(list, "stat(%s) failed: %m",
                                                  path);
                } else if (list->mail_set->mail_debug) {
-                       i_info("Namespace %s: Permission lookup failed from %s",
+                       i_debug("Namespace %s: Permission lookup failed from %s",
                               list->ns->prefix, path);
                }
                if (name != NULL) {
@@ -419,11 +419,11 @@ mailbox_list_get_permissions_full(struct mailbox_list *list, const char *name,
        }
 
        if (list->mail_set->mail_debug && name == NULL) {
-               i_info("Namespace %s: Using permissions from %s: "
-                      "mode=0%o gid=%ld", list->ns->prefix, path,
-                      (int)list->dir_create_mode,
-                      list->file_create_gid == (gid_t)-1 ? -1L :
-                      (long)list->file_create_gid);
+               i_debug("Namespace %s: Using permissions from %s: "
+                       "mode=0%o gid=%ld", list->ns->prefix, path,
+                       (int)list->dir_create_mode,
+                       list->file_create_gid == (gid_t)-1 ? -1L :
+                       (long)list->file_create_gid);
        }
 }
 

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index f69d90b88e07e149e653d191fef6bf2f8b53024a..39d7ebc44d61ae41b7e123566549bd71ebbbfed4 100644 (file)
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -132,7 +132,7 @@ static void client_auth_parse_args(struct client *client,
                } else if (strcmp(key, "user") == 0) {
                        /* already handled in login-common */
                } else if (client->set->auth_debug)
-                       i_info("Ignoring unknown passdb extra field: %s", key);
+                       i_debug("Ignoring unknown passdb extra field: %s", key);
        }
 
        if (reply_r->destuser == NULL)

diff --git a/src/plugins/acl/acl-backend-vfile.c b/src/plugins/acl/acl-backend-vfile.c
index 24090a7273cc2ad4fc5917c94c13e327a523dd55..40166cd4bb12f09573489a2cb7bc53ff951c114d 100644 (file)
--- a/src/plugins/acl/acl-backend-vfile.c
+++ b/src/plugins/acl/acl-backend-vfile.c
@@ -100,8 +100,8 @@ acl_backend_vfile_init(struct acl_backend *_backend, const char *data)
                }
        }
        if (_backend->debug) {
-               i_info("acl vfile: Global ACL directory: %s",
-                      backend->global_dir);
+               i_debug("acl vfile: Global ACL directory: %s",
+                       backend->global_dir);
        }
 
        _backend->cache =
@@ -487,11 +487,12 @@ acl_backend_vfile_read(struct acl_object_vfile *aclobj,
        if (fd == -1) {
                if (errno == ENOENT || errno == ENOTDIR) {
                        if (aclobj->aclobj.backend->debug)
-                               i_info("acl vfile: file %s not found", path);
+                               i_debug("acl vfile: file %s not found", path);
                        validity->last_mtime = VALIDITY_MTIME_NOTFOUND;
                } else if (errno == EACCES) {
                        if (aclobj->aclobj.backend->debug)
-                               i_info("acl vfile: no access to file %s", path);
+                               i_debug("acl vfile: no access to file %s",
+                                       path);
 
                        acl_backend_remove_all_access(&aclobj->aclobj);
                        validity->last_mtime = VALIDITY_MTIME_NOACCESS;
@@ -523,7 +524,7 @@ acl_backend_vfile_read(struct acl_object_vfile *aclobj,
        }
 
        if (aclobj->aclobj.backend->debug)
-               i_info("acl vfile: reading file %s", path);
+               i_debug("acl vfile: reading file %s", path);
 
        input = i_stream_create_fd(fd, 4096, FALSE);
        i_stream_set_return_partial_line(input, TRUE);

diff --git a/src/plugins/acl/acl-backend.c b/src/plugins/acl/acl-backend.c
index 5a6cc7df6fd4fbf781d3b4a996add1aae4845ef0..296bc9e02c400bc6e030bcccbf7d314eaff46c19 100644 (file)
--- a/src/plugins/acl/acl-backend.c
+++ b/src/plugins/acl/acl-backend.c
@@ -39,9 +39,9 @@ acl_backend_init(const char *data, struct mailbox_list *list,
        unsigned int i, group_count;
 
        if (user->mail_debug) {
-               i_info("acl: initializing backend with data: %s", data);
-               i_info("acl: acl username = %s", acl_username);
-               i_info("acl: owner = %d", owner);
+               i_debug("acl: initializing backend with data: %s", data);
+               i_debug("acl: acl username = %s", acl_username);
+               i_debug("acl: owner = %d", owner);
        }
 
        group_count = str_array_length(groups);

diff --git a/src/plugins/acl/acl-lookup-dict.c b/src/plugins/acl/acl-lookup-dict.c
index b6a4b6895ab295be096cb60511c2b84df8328a8b..620fc767a5f2871176801c97e74905a88a57f966 100644 (file)
--- a/src/plugins/acl/acl-lookup-dict.c
+++ b/src/plugins/acl/acl-lookup-dict.c
@@ -49,8 +49,8 @@ struct acl_lookup_dict *acl_lookup_dict_init(struct mail_user *user)
                if (dict->dict == NULL)
                        i_error("acl: dict_init(%s) failed", uri);
        } else if (user->mail_debug) {
-               i_info("acl: No acl_shared_dict setting - "
-                      "shared mailbox listing is disabled");
+               i_debug("acl: No acl_shared_dict setting - "
+                       "shared mailbox listing is disabled");
        }
        return dict;
 }

diff --git a/src/plugins/acl/acl-storage.c b/src/plugins/acl/acl-storage.c
index 28540d61572a062255946ae19daf30f73b0935d0..1d12835a2e22e59146fbc881ce27ce1ed4956ce1 100644 (file)
--- a/src/plugins/acl/acl-storage.c
+++ b/src/plugins/acl/acl-storage.c
@@ -74,7 +74,7 @@ void acl_mail_user_created(struct mail_user *user)
                acl_mail_user_create(user, env);
        else {
                if (user->mail_debug)
-                       i_info("acl: No acl setting - ACLs are disabled");
+                       i_debug("acl: No acl setting - ACLs are disabled");
        }
 
        if (acl_next_hook_mail_user_created != NULL)

diff --git a/src/plugins/autocreate/autocreate-plugin.c b/src/plugins/autocreate/autocreate-plugin.c
index 7193f1b71528b2f176cdaf59f04af8da5438920c..b488e573dafed0a10882e6e28acea7b50f92633a 100644 (file)
--- a/src/plugins/autocreate/autocreate-plugin.c
+++ b/src/plugins/autocreate/autocreate-plugin.c
@@ -23,7 +23,7 @@ autocreate_mailbox(struct mail_namespace *namespaces, const char *name)
        ns = mail_namespace_find(namespaces, &name);
        if (ns == NULL) {
                if (namespaces->mail_set->mail_debug)
-                       i_info("autocreate: No namespace found for %s", name);
+                       i_debug("autocreate: No namespace found for %s", name);
                return;
        }
 
@@ -32,8 +32,8 @@ autocreate_mailbox(struct mail_namespace *namespaces, const char *name)
                str = mail_storage_get_last_error(mailbox_get_storage(box),
                                                  &error);
                if (error != MAIL_ERROR_EXISTS && ns->mail_set->mail_debug) {
-                       i_info("autocreate: Failed to create mailbox %s: %s",
-                              name, str);
+                       i_debug("autocreate: Failed to create mailbox %s: %s",
+                               name, str);
                }
        }
        mailbox_close(&box);
@@ -66,7 +66,7 @@ autosubscribe_mailbox(struct mail_namespace *namespaces, const char *name)
        ns = mail_namespace_find_subscribable(namespaces, &name);
        if (ns == NULL) {
                if (namespaces->mail_set->mail_debug)
-                       i_info("autocreate: No namespace found for %s", name);
+                       i_debug("autocreate: No namespace found for %s", name);
                return;
        }
 
@@ -74,8 +74,8 @@ autosubscribe_mailbox(struct mail_namespace *namespaces, const char *name)
                str = mailbox_list_get_last_error(ns->list,
                                                  &error);
                if (error != MAIL_ERROR_EXISTS && ns->mail_set->mail_debug) {
-                       i_info("autocreate: Failed to subscribe mailbox %s: %s",
-                              name, str);
+                       i_debug("autocreate: Failed to subscribe mailbox "
+                               "%s: %s", name, str);
                }
        }
 }

diff --git a/src/plugins/convert/convert-plugin.c b/src/plugins/convert/convert-plugin.c
index 442accde859e69ef4f7924b9719fa32ecb1e37e1..1052892c36bc63ed6b6b491c16011adc133427a7 100644 (file)
--- a/src/plugins/convert/convert-plugin.c
+++ b/src/plugins/convert/convert-plugin.c
@@ -47,7 +47,7 @@ convert_hook_mail_namespaces_created(struct mail_namespace *namespaces)
        if (convert_mail != NULL)
                convert_mail_storage(namespaces, convert_mail);
        else if (namespaces->user->mail_debug)
-               i_info("convert: No convert_mail setting - plugin disabled");
+               i_debug("convert: No convert_mail setting - plugin disabled");
 
        if (convert_next_hook_mail_namespaces_created != NULL)
                convert_next_hook_mail_namespaces_created(namespaces);

diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c
index 5ab3900f3f7c40f2a0220b9cfc789b5c34c738bc..a2e3108d23a1d99fcb61ae15ce879ef9cf433306 100644 (file)
--- a/src/plugins/expire/expire-plugin.c
+++ b/src/plugins/expire/expire-plugin.c
@@ -262,11 +262,11 @@ static void expire_mailbox_allocate_init(struct mailbox *box,
        secs = expire_box_find_min_secs(euser->env, box->vname, &altmove);
        if (box->storage->user->mail_debug) {
                if (secs == 0) {
-                       i_info("expire: No expiring in mailbox: %s",
-                              box->vname);
+                       i_debug("expire: No expiring in mailbox: %s",
+                               box->vname);
                } else {
-                       i_info("expire: Mails expire in %u secs in mailbox: %s",
-                              secs, box->vname);
+                       i_debug("expire: Mails expire in %u secs in mailbox: "
+                               "%s", secs, box->vname);
                }
        }
        if (secs != 0)
@@ -309,8 +309,8 @@ static void expire_mail_namespaces_created(struct mail_namespace *ns)
                /* expire-tool handles all of this internally */
        } else if (expunge_env == NULL && altmove_env == NULL) {
                if (user->mail_debug) {
-                       i_info("expire: No expire or expire_altmove settings - "
-                              "plugin disabled");
+                       i_debug("expire: No expire or expire_altmove settings - "
+                               "plugin disabled");
                }
        } else if (dict_uri == NULL) {
                i_error("expire plugin: expire_dict setting missing");

diff --git a/src/plugins/fts-lucene/fts-backend-lucene.c b/src/plugins/fts-lucene/fts-backend-lucene.c
index 7059448039627bfb97135a755edf9035d7a60d66..fd306a3483456c0384ab459fcc439bdbbf9d2578 100644 (file)
--- a/src/plugins/fts-lucene/fts-backend-lucene.c
+++ b/src/plugins/fts-lucene/fts-backend-lucene.c
@@ -53,7 +53,7 @@ static struct fts_backend *fts_backend_lucene_init(struct mailbox *box)
                if (path == NULL) {
                        /* in-memory indexes */
                        if (box->storage->set->mail_debug)
-                               i_info("fts squat: Disabled with in-memory indexes");
+                               i_debug("fts squat: Disabled with in-memory indexes");
                        return NULL;
                }
 

diff --git a/src/plugins/fts-squat/fts-backend-squat.c b/src/plugins/fts-squat/fts-backend-squat.c
index 4ed3783743af9f298835a9765ec54ded5aaa0944..48ebbdbb839abc91277afee7ee588abe465f9ea8 100644 (file)
--- a/src/plugins/fts-squat/fts-backend-squat.c
+++ b/src/plugins/fts-squat/fts-backend-squat.c
@@ -64,7 +64,7 @@ static struct fts_backend *fts_backend_squat_init(struct mailbox *box)
        if (*path == '\0') {
                /* in-memory indexes */
                if (storage->set->mail_debug)
-                       i_info("fts squat: Disabled with in-memory indexes");
+                       i_debug("fts squat: Disabled with in-memory indexes");
                return NULL;
        }
 

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index aed65364c002cfeb723913679026a973f4613e6b..538831da9e5108cc3723be27a04351035c2f2252 100644 (file)
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -933,7 +933,7 @@ static void fts_box_backends_init(struct mailbox *box)
        }
        if (box->storage->set->mail_debug &&
            fbox->backend_substr == NULL && fbox->backend_fast == NULL)
-               i_info("fts: No backends enabled by the fts setting");
+               i_debug("fts: No backends enabled by the fts setting");
 }
 
 static struct mailbox_transaction_context *

diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index e6bb53e1c501fe275df80d460e2d3cb9df9e300c..38587b39157ef88bd289714203091874ce60fdca 100644 (file)
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -429,8 +429,8 @@ static void lazy_expunge_mail_user_created(struct mail_user *user)
 
                MODULE_CONTEXT_SET(user, lazy_expunge_mail_user_module, luser);
        } else if (user->mail_debug) {
-               i_info("lazy_expunge: No lazy_expunge setting - "
-                      "plugin disabled");
+               i_debug("lazy_expunge: No lazy_expunge setting - "
+                       "plugin disabled");
        }
 
        if (lazy_expunge_next_hook_mail_user_created != NULL)

diff --git a/src/plugins/quota/quota-dict.c b/src/plugins/quota/quota-dict.c
index c6f39d1298a1a933671ac9fa4eb6175ea8ad09f1..dd50becbb351626470144fb8af59e0044c381bba 100644 (file)
--- a/src/plugins/quota/quota-dict.c
+++ b/src/plugins/quota/quota-dict.c
@@ -66,8 +66,8 @@ static int dict_quota_init(struct quota_root *_root, const char *args)
                username = _root->quota->user->username;
 
        if (_root->quota->set->debug) {
-               i_info("dict quota: user=%s, uri=%s, noenforcing=%d",
-                      username, args, _root->no_enforcing);
+               i_debug("dict quota: user=%s, uri=%s, noenforcing=%d",
+                       username, args, _root->no_enforcing);
        }
 
        /* FIXME: we should use 64bit integer as datatype instead but before

diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index 20a3368a7cdec4af1e8051036bc3b962949aa630..b0328e040d06de297caca995fb1ffad3a7cce6c0 100644 (file)
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -261,9 +261,9 @@ static void fs_quota_namespace_added(struct quota *quota,
        mount = fs_quota_mountpoint_get(dir);
        if (mount != NULL) {
                if (quota->set->debug) {
-                       i_info("fs quota add mailbox dir = %s", dir);
-                       i_info("fs quota block device = %s", mount->device_path);
-                       i_info("fs quota mount point = %s", mount->mount_path);
+                       i_debug("fs quota add mailbox dir = %s", dir);
+                       i_debug("fs quota block device = %s", mount->device_path);
+                       i_debug("fs quota mount point = %s", mount->mount_path);
                }
 
                root = fs_quota_root_find_mountpoint(quota, mount);
@@ -315,9 +315,9 @@ static int do_rquota_user(struct fs_quota_root *root, bool bytes,
        path++;
 
        if (root->root.quota->set->debug) {
-               i_info("quota-fs: host=%s, path=%s, uid=%s, %s",
-                      host, path, dec2str(root->uid),
-                      bytes ? "bytes" : "files");
+               i_debug("quota-fs: host=%s, path=%s, uid=%s, %s",
+                       host, path, dec2str(root->uid),
+                       bytes ? "bytes" : "files");
        }
 
        /* clnt_create() polls for a while to establish a connection */
@@ -372,17 +372,17 @@ static int do_rquota_user(struct fs_quota_root *root, bool bytes,
                        }
                }
                if (root->root.quota->set->debug) {
-                       i_info("quota-fs: uid=%s, value=%llu, "
-                              "limit=%llu, active=%d", dec2str(root->uid),
-                              (unsigned long long)*value_r,
-                              (unsigned long long)*limit_r, rq->rq_active);
+                       i_debug("quota-fs: uid=%s, value=%llu, "
+                               "limit=%llu, active=%d", dec2str(root->uid),
+                               (unsigned long long)*value_r,
+                               (unsigned long long)*limit_r, rq->rq_active);
                }
                return 1;
        }
        case Q_NOQUOTA:
                if (root->root.quota->set->debug) {
-                       i_info("quota-fs: uid=%s, limit=unlimited",
-                              dec2str(root->uid));
+                       i_debug("quota-fs: uid=%s, limit=unlimited",
+                               dec2str(root->uid));
                }
                return 1;
        case Q_EPERM:
@@ -415,9 +415,9 @@ static int do_rquota_group(struct fs_quota_root *root, bool bytes,
        path++;
 
        if (root->root.quota->set->debug) {
-               i_info("quota-fs: host=%s, path=%s, gid=%s, %s",
-                      host, path, dec2str(root->gid),
-                      bytes ? "bytes" : "files");
+               i_debug("quota-fs: host=%s, path=%s, gid=%s, %s",
+                       host, path, dec2str(root->gid),
+                       bytes ? "bytes" : "files");
        }
 
        /* clnt_create() polls for a while to establish a connection */
@@ -473,17 +473,17 @@ static int do_rquota_group(struct fs_quota_root *root, bool bytes,
                        }
                }
                if (root->root.quota->set->debug) {
-                       i_info("quota-fs: gid=%s, value=%llu, "
-                              "limit=%llu, active=%d", dec2str(root->gid),
-                              (unsigned long long)*value_r,
-                              (unsigned long long)*limit_r, rq->rq_active);
+                       i_debug("quota-fs: gid=%s, value=%llu, "
+                               "limit=%llu, active=%d", dec2str(root->gid),
+                               (unsigned long long)*value_r,
+                               (unsigned long long)*limit_r, rq->rq_active);
                }
                return 1;
        }
        case Q_NOQUOTA:
                if (root->root.quota->set->debug) {
-                       i_info("quota-fs: gid=%s, limit=unlimited",
-                              dec2str(root->gid));
+                       i_debug("quota-fs: gid=%s, limit=unlimited",
+                               dec2str(root->gid));
                }
                return 1;
        case Q_EPERM:
@@ -724,15 +724,15 @@ static bool fs_quota_match_box(struct quota_root *_root, struct mailbox *box)
        }
        if (stat(root->storage_mount_path, &rst) < 0) {
                if (_root->quota->set->debug) {
-                       i_error("stat(%s) failed: %m",
+                       i_debug("stat(%s) failed: %m",
                                root->storage_mount_path);
                }
                return FALSE;
        }
        match = CMP_DEV_T(mst.st_dev, rst.st_dev);
        if (_root->quota->set->debug) {
-               i_info("box=%s mount=%s match=%s", mailbox_path,
-                      root->storage_mount_path, match ? "yes" : "no");
+               i_debug("box=%s mount=%s match=%s", mailbox_path,
+                       root->storage_mount_path, match ? "yes" : "no");
        }
        return match;
 }

diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c
index e5bc255393a1b4ef7176b17b8d7dfab4fb06d7d7..547a41bab737512dfb57b695399dee709cd23c61 100644 (file)
--- a/src/plugins/quota/quota-storage.c
+++ b/src/plugins/quota/quota-storage.c
@@ -485,7 +485,7 @@ void quota_mail_user_created(struct mail_user *user)
 
                MODULE_CONTEXT_SET(user, quota_user_module, quser);
        } else if (user->mail_debug) {
-               i_info("quota: No quota setting - plugin disabled");
+               i_debug("quota: No quota setting - plugin disabled");
        }
 
        if (quota_next_hook_mail_user_created != NULL)

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 301b0c1bcb4e966298b4ba15d57e123f8d4ffb2f..2924e0b5cba7aca2e5ca3d54f82d1cf1d1182249 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -188,8 +188,8 @@ quota_root_settings_init(struct quota_settings *quota_set, const char *root_def)
        root_set->args = p_strdup(quota_set->pool, args);
 
        if (quota_set->debug) {
-               i_info("Quota root: name=%s backend=%s args=%s",
-                      root_set->name, backend_name, args == NULL ? "" : args);
+               i_debug("Quota root: name=%s backend=%s args=%s",
+                       root_set->name, backend_name, args == NULL ? "" : args);
        }
 
        p_array_init(&root_set->rules, quota_set->pool, 4);
@@ -459,8 +459,8 @@ int quota_root_add_rule(struct quota_root_settings *root_set,
        if (strcmp(p, "ignore") == 0) {
                rule->ignore = TRUE;
                if (root_set->set->debug) {
-                       i_info("Quota rule: root=%s mailbox=%s ignored",
-                              root_set->name, mailbox_name);
+                       i_debug("Quota rule: root=%s mailbox=%s ignored",
+                               root_set->name, mailbox_name);
                }
                return 0;
        }
@@ -479,15 +479,14 @@ int quota_root_add_rule(struct quota_root_settings *root_set,
 
        quota_root_recalculate_relative_rules(root_set);
        if (root_set->set->debug) {
-               i_info("Quota rule: root=%s mailbox=%s "
-                      "bytes=%lld%s messages=%lld%s", root_set->name,
-                      mailbox_name,
-                      (long long)rule->bytes_limit,
-                      rule->bytes_percent == 0 ? "" :
-                      t_strdup_printf(" (%u%%)", rule->bytes_percent),
-                      (long long)rule->count_limit,
-                      rule->count_percent == 0 ? "" :
-                      t_strdup_printf(" (%u%%)", rule->count_percent));
+               i_debug("Quota rule: root=%s mailbox=%s "
+                       "bytes=%lld%s messages=%lld%s", root_set->name,
+                       mailbox_name, (long long)rule->bytes_limit,
+                       rule->bytes_percent == 0 ? "" :
+                       t_strdup_printf(" (%u%%)", rule->bytes_percent),
+                       (long long)rule->count_limit,
+                       rule->count_percent == 0 ? "" :
+                       t_strdup_printf(" (%u%%)", rule->count_percent));
        }
        return ret;
 }
@@ -626,15 +625,15 @@ int quota_root_add_warning_rule(struct quota_root_settings *root_set,
 
        quota_root_recalculate_relative_rules(root_set);
        if (root_set->set->debug) {
-               i_info("Quota warning: bytes=%llu%s "
-                      "messages=%llu%s command=%s",
-                      (unsigned long long)warning->rule.bytes_limit,
-                      warning->rule.bytes_percent == 0 ? "" :
-                      t_strdup_printf(" (%u%%)", warning->rule.bytes_percent),
-                      (unsigned long long)warning->rule.count_limit,
-                      warning->rule.count_percent == 0 ? "" :
-                      t_strdup_printf(" (%u%%)", warning->rule.count_percent),
-                      warning->command);
+               i_debug("Quota warning: bytes=%llu%s "
+                       "messages=%llu%s command=%s",
+                       (unsigned long long)warning->rule.bytes_limit,
+                       warning->rule.bytes_percent == 0 ? "" :
+                       t_strdup_printf(" (%u%%)", warning->rule.bytes_percent),
+                       (unsigned long long)warning->rule.count_limit,
+                       warning->rule.count_percent == 0 ? "" :
+                       t_strdup_printf(" (%u%%)", warning->rule.count_percent),
+                       warning->command);
        }
        return 0;
 }
@@ -876,7 +875,7 @@ static void quota_warning_execute(struct quota_root *root, const char *cmd)
        int ret;
 
        if (root->quota->set->debug)
-               i_info("quota: Executing warning: %s", cmd);
+               i_debug("quota: Executing warning: %s", cmd);
 
        ret = system(cmd);
        if (ret < 0) {

diff --git a/src/plugins/trash/trash-plugin.c b/src/plugins/trash/trash-plugin.c
index f39330df55f171d70acc806a74b1c0749e6f36a6..5dd0f1fbfc899c0091a3b4454e03abb75ad0c413 100644 (file)
--- a/src/plugins/trash/trash-plugin.c
+++ b/src/plugins/trash/trash-plugin.c
@@ -175,10 +175,10 @@ err:
 
        if (size_expunged < size_needed) {
                if (ctx->quota->user->mail_debug) {
-                       i_info("trash plugin: Failed to remove enough messages "
-                              "(needed %llu bytes, expunged only %llu bytes)",
-                              (unsigned long long)size_needed,
-                              (unsigned long long)size_expunged);
+                       i_debug("trash plugin: Failed to remove enough messages "
+                               "(needed %llu bytes, expunged only %llu bytes)",
+                               (unsigned long long)size_needed,
+                               (unsigned long long)size_expunged);
                }
                return FALSE;
        }
@@ -200,8 +200,8 @@ trash_quota_test_alloc(struct quota_transaction_context *ctx,
                ret = trash_next_quota_test_alloc(ctx, size, too_large_r);
                if (ret != 0 || *too_large_r) {
                        if (ctx->quota->user->mail_debug && *too_large_r) {
-                               i_info("trash plugin: Mail is larger than "
-                                      "quota, won't even try to handle");
+                               i_debug("trash plugin: Mail is larger than "
+                                       "quota, won't even try to handle");
                        }
                        return ret;
                }
@@ -282,8 +282,8 @@ static int read_configuration(struct mail_user *user, const char *path)
                }
 
                if (user->mail_debug) {
-                       i_info("trash plugin: Added '%s' with priority %d",
-                              trash->name, trash->priority);
+                       i_debug("trash plugin: Added '%s' with priority %d",
+                               trash->name, trash->priority);
                }
        }
        i_stream_destroy(&input);
@@ -304,7 +304,7 @@ trash_hook_mail_namespaces_created(struct mail_namespace *namespaces)
        env = mail_user_plugin_getenv(user, "trash");
        if (env == NULL) {
                if (user->mail_debug)
-                       i_info("trash: No trash setting - plugin disabled");
+                       i_debug("trash: No trash setting - plugin disabled");
        } else if (quser == NULL) {
                i_error("trash plugin: quota plugin not initialized");
        } else {