lib-storage: Replace "if(mail_debug)" with "if(event_want_debug_log)"

diff --git a/src/lib-storage/list/subscription-file.c b/src/lib-storage/list/subscription-file.c
index a23d633bb290edaff603b8d657805755264c4029..8096d3a1269d13fd1ffd284c64d808e50d082458 100644 (file)
--- a/src/lib-storage/list/subscription-file.c
+++ b/src/lib-storage/list/subscription-file.c
@@ -33,7 +33,7 @@ static const char version2_header[] = "V\t2\n\n";
 static void subsread_set_syscall_error(struct mailbox_list *list,
                                       const char *function, const char *path)
 {
-       if (errno == EACCES && !list->mail_set->mail_debug) {
+       if (errno == EACCES && !event_want_debug_log(list->ns->user->event)) {
                mailbox_list_set_error(list, MAIL_ERROR_PERM,
                                       "No permission to read subscriptions");
        } else {
@@ -46,7 +46,7 @@ static void subsread_set_syscall_error(struct mailbox_list *list,
 static void subswrite_set_syscall_error(struct mailbox_list *list,
                                        const char *function, const char *path)
 {
-       if (errno == EACCES && !list->mail_set->mail_debug) {
+       if (errno == EACCES && !event_want_debug_log(list->ns->user->event)) {
                mailbox_list_set_error(list, MAIL_ERROR_PERM,
                                       "No permission to modify subscriptions");
        } else {

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 4e85a485b762b6a3f4ddda420eaba7bdf9037450..ccfa9b47db24e18867c96ae3242706a3bc1089ec 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -285,7 +285,7 @@ mail_storage_create_root(struct mailbox_list *list,
        }
 
        if ((flags & MAIL_STORAGE_FLAG_NO_AUTOVERIFY) != 0) {
-               if (!list->mail_set->mail_debug)
+               if (!event_want_debug_log(list->ns->user->event))
                        return 0;
 
                /* we don't need to verify, but since debugging is
@@ -775,7 +775,7 @@ bool mail_storage_set_error_from_errno(struct mail_storage *storage)
 
        if (!mail_error_from_errno(&error, &error_string))
                return FALSE;
-       if (storage->set->mail_debug && error != MAIL_ERROR_NOTFOUND) {
+       if (event_want_debug_log(storage->event) && error != MAIL_ERROR_NOTFOUND) {
                /* debugging is enabled - admin may be debugging a
                   (permission) problem, so return FALSE to get the caller to
                   log the full error message. */