Re: PATCH: Access priority

[Ben Schmidt <mail_ben_schmidt@yahoo.com.au>]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

Here is an updated version of this patch that applies on top of the revised 
notmetoo patch I just emailed.

Ben.



On 25/01/10 10:02 PM, Ben Schmidt wrote:
> This patch fixes something that I got bitten by last week, and since I
> spotted the place in the code while I was working on the other stuff, I
> did this too! It applies over 1.2.17.
>
> The problem is that if you have a list that is 'moderated' or
> 'modnonsubposts', the 'allow' access keyword is ineffective, but behaves
> like 'moderate'. This patch fixes that so that access rules have
> priority, and do what they say.
>
> I think this is more intuitive.
>
> Do others agree? Or could this change cause problems? If not, or the
> perceived problems are minor enough, could this be included in mlmmj?
>
> I have tested it, and it works for me.
>
> Ben.
>

[-- Attachment #2: mlmmj-access-2.patch --]
[-- Type: text/x-patch, Size: 827 bytes --]

diff -ru mlmmj-1.2.17/src/mlmmj-process.c mlmmj-1.2.17-mod/src/mlmmj-process.c
--- mlmmj-1.2.17/src/mlmmj-process.c	2010-01-26 00:13:49.000000000 +1100
+++ mlmmj-1.2.17-mod/src/mlmmj-process.c	2010-01-26 00:15:26.000000000 +1100
@@ -852,6 +854,9 @@
 	}
 
 startaccess:
+	if(!moderated)
+		moderated = statctrl(listdir, "moderated");
+
 	noaccessdenymails = statctrl(listdir, "noaccessdenymails");
 
 	access_rules = ctrlvalues(listdir, "access");
@@ -918,13 +923,13 @@
 			myfree(donemailname);
 			myfree(discardname);
                 	exit(EXIT_SUCCESS);
+		} else if (accret == ALLOW) {
+			moderated = 0;
 		}
 	}
 
 	notmetoo = statctrl(listdir, "notmetoo");
 
-	if(!moderated)
-		moderated = statctrl(listdir, "moderated");
 	if(moderated) {
 		mqueuename = concatstr(3, listdir, "/moderation/",
 				       randomstr);