X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mx.c;h=d4c0bccba4193a9291f6947d1b97b7f9695f3f72;hb=c86620f29c5e043a27ec3490d83af462e55c0143;hp=2a9e17bbdce75ae99a0449cee5609ad698abec8b;hpb=7ea0c50703a93a8fb4f0dd05fc4e023cfc9ffd36;p=apps%2Fmadmutt.git

diff --git a/mx.c b/mx.c
index 2a9e17b..d4c0bcc 100644
--- a/mx.c
+++ b/mx.c
@@ -550,8 +550,7 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
   if (!ctx->quiet)
     mutt_message (_("Reading %s..."), ctx->path);
 
-  if ((rc = mx_get_idx (ctx->path)) >= 0)
-    rc = MX_COMMAND(rc,mx_open_mailbox)(ctx);
+  rc = MX_COMMAND(ctx->magic-1,mx_open_mailbox)(ctx);
 
   if (rc == 0) {
     if ((flags & M_NOSORT) == 0) {
@@ -1543,6 +1542,15 @@ int mx_check_empty (const char *path)
   return (-1);
 }
 
+int mx_acl_check (CONTEXT* ctx, int flag) {
+  if (!ctx || ctx->magic <= 0 || ctx->magic >= MailboxFormats->length)
+    return (0);
+  /* if no acl_check defined for module, assume permission is granted */
+  if (!MX_COMMAND(ctx->magic-1,mx_acl_check))
+    return (1);
+  return (MX_COMMAND(ctx->magic-1,mx_acl_check)(ctx,flag));
+}
+
 void mx_init (void) {
 #ifdef DEBUG
   int i = 0;