Mercurial > dovecot > core-2.2
changeset 10082:62b37dcf173e HEAD
Log debug-level messages with i_debug().
line wrap: on
line diff
--- a/src/auth/auth-client-connection.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/auth-client-connection.c Fri Oct 16 13:01:19 2009 +0000 @@ -64,8 +64,8 @@ } 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 @@ 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 @@ { 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);
--- a/src/auth/auth-master-connection.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/auth-master-connection.c Fri Oct 16 13:01:19 2009 +0000 @@ -54,7 +54,7 @@ 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 @@ } 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 @@ } 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 @@ 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);
--- a/src/auth/auth-request.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/auth-request.c Fri Oct 16 13:01:19 2009 +0000 @@ -1449,7 +1449,7 @@ 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); }
--- a/src/auth/db-passwd-file.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/db-passwd-file.c Fri Oct 16 13:01:19 2009 +0000 @@ -202,8 +202,8 @@ 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; }
--- a/src/auth/passdb.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/passdb.c Fri Oct 16 13:01:19 2009 +0000 @@ -113,7 +113,7 @@ 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); }
--- a/src/auth/userdb-ldap.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/userdb-ldap.c Fri Oct 16 13:01:19 2009 +0000 @@ -201,10 +201,10 @@ 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);
--- a/src/auth/userdb-prefetch.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/auth/userdb-prefetch.c Fri Oct 16 13:01:19 2009 +0000 @@ -28,7 +28,7 @@ } 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"); }
--- a/src/lib-auth/auth-master.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-auth/auth-master.c Fri Oct 16 13:01:19 2009 +0000 @@ -130,7 +130,7 @@ 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);
--- a/src/lib-auth/auth-server-connection.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-auth/auth-server-connection.c Fri Oct 16 13:01:19 2009 +0000 @@ -202,7 +202,7 @@ 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)
--- a/src/lib-lda/mail-send.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-lda/mail-send.c Fri Oct 16 13:01:19 2009 +0000 @@ -83,8 +83,8 @@ } 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 @@ 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);
--- a/src/lib-storage/index/maildir/maildir-storage.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-storage/index/maildir/maildir-storage.c Fri Oct 16 13:01:19 2009 +0000 @@ -165,17 +165,17 @@ 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 @@ 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 @@ 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; }
--- a/src/lib-storage/index/mbox/mbox-storage.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-storage/index/mbox/mbox-storage.c Fri Oct 16 13:01:19 2009 +0000 @@ -152,7 +152,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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; } }
--- a/src/lib-storage/mail-namespace.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-storage/mail-namespace.c Fri Oct 16 13:01:19 2009 +0000 @@ -102,14 +102,14 @@ 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')
--- a/src/lib-storage/mail-storage-service.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-storage/mail-storage-service.c Fri Oct 16 13:01:19 2009 +0000 @@ -188,7 +188,7 @@ 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_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 @@ 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); } }
--- a/src/lib-storage/mailbox-list.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/lib-storage/mailbox-list.c Fri Oct 16 13:01:19 2009 +0000 @@ -158,14 +158,14 @@ } 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_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 @@ } 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); } }
--- a/src/login-common/client-common-auth.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/login-common/client-common-auth.c Fri Oct 16 13:01:19 2009 +0000 @@ -132,7 +132,7 @@ } 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)
--- a/src/plugins/acl/acl-backend-vfile.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/acl/acl-backend-vfile.c Fri Oct 16 13:01:19 2009 +0000 @@ -100,8 +100,8 @@ } } 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 @@ 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 @@ } 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);
--- a/src/plugins/acl/acl-backend.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/acl/acl-backend.c Fri Oct 16 13:01:19 2009 +0000 @@ -39,9 +39,9 @@ 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);
--- a/src/plugins/acl/acl-lookup-dict.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/acl/acl-lookup-dict.c Fri Oct 16 13:01:19 2009 +0000 @@ -49,8 +49,8 @@ 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; }
--- a/src/plugins/acl/acl-storage.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/acl/acl-storage.c Fri Oct 16 13:01:19 2009 +0000 @@ -74,7 +74,7 @@ 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)
--- a/src/plugins/autocreate/autocreate-plugin.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/autocreate/autocreate-plugin.c Fri Oct 16 13:01:19 2009 +0000 @@ -23,7 +23,7 @@ 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 @@ 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 @@ 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 @@ 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); } } }
--- a/src/plugins/convert/convert-plugin.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/convert/convert-plugin.c Fri Oct 16 13:01:19 2009 +0000 @@ -47,7 +47,7 @@ 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);
--- a/src/plugins/expire/expire-plugin.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/expire/expire-plugin.c Fri Oct 16 13:01:19 2009 +0000 @@ -262,11 +262,11 @@ 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 @@ /* 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");
--- a/src/plugins/fts-lucene/fts-backend-lucene.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/fts-lucene/fts-backend-lucene.c Fri Oct 16 13:01:19 2009 +0000 @@ -53,7 +53,7 @@ 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; }
--- a/src/plugins/fts-squat/fts-backend-squat.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/fts-squat/fts-backend-squat.c Fri Oct 16 13:01:19 2009 +0000 @@ -64,7 +64,7 @@ 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; }
--- a/src/plugins/fts/fts-storage.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/fts/fts-storage.c Fri Oct 16 13:01:19 2009 +0000 @@ -933,7 +933,7 @@ } 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 *
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c Fri Oct 16 13:01:19 2009 +0000 @@ -429,8 +429,8 @@ 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)
--- a/src/plugins/quota/quota-dict.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/quota/quota-dict.c Fri Oct 16 13:01:19 2009 +0000 @@ -66,8 +66,8 @@ 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
--- a/src/plugins/quota/quota-fs.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/quota/quota-fs.c Fri Oct 16 13:01:19 2009 +0000 @@ -261,9 +261,9 @@ 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 @@ 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 @@ } } 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 @@ 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 @@ } } 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 @@ } 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; }
--- a/src/plugins/quota/quota-storage.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/quota/quota-storage.c Fri Oct 16 13:01:19 2009 +0000 @@ -485,7 +485,7 @@ 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)
--- a/src/plugins/quota/quota.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/quota/quota.c Fri Oct 16 13:01:19 2009 +0000 @@ -188,8 +188,8 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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) {
--- a/src/plugins/trash/trash-plugin.c Thu Oct 15 22:26:03 2009 -0400 +++ b/src/plugins/trash/trash-plugin.c Fri Oct 16 13:01:19 2009 +0000 @@ -175,10 +175,10 @@ 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 @@ 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 @@ } 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 @@ 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 {