CVS: tmda/bin ChangeLog,1.47,1.48 tmda-filter,1.39,1.40

Update of /cvsroot/tmda/tmda/bin
In directory usw-pr-cvs1:/tmp/cvs-serv27194/bin

Modified Files:
        ChangeLog tmda-filter 
Log Message:
Check 'confirm' before the whitelist.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog   2001/07/23 19:13:10     1.47
+++ ChangeLog   2001/07/23 19:15:46     1.48
@@ -3,6 +3,10 @@
        * tmda-filter (locate_pending): Send confirmation acceptance
        notice from bouncegen() instead of here.
 
+       (main): Check for 'confirm' addresses before looking at the
+       whitelist in case a confirmation is sent from a whitelisted
+       sender.
+               
        (bouncegen): Add optional 'dated' and 'sender' variables if
        specified in the .tmdarc.
 

Index: tmda-filter
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-filter,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tmda-filter 2001/07/23 19:13:10     1.39
+++ tmda-filter 2001/07/23 19:15:46     1.40
@@ -429,15 +429,6 @@
                 sys.exit(Defaults.ERR_HARD)
                 pass
 
-        # Is the sender in the WHITELIST?
-        if os.path.exists(Defaults.WHITELIST):
-            whitelist_list = []
-            whitelist_list = 
Util.file_to_list(Defaults.WHITELIST,whitelist_list)
-            if Util.findmatch(whitelist_list, EnvelopeSender,From,ReplyTo):
-                logit("OK whitelist_match", time.time())
-                sys.exit(Defaults.ERR_OK)
-                pass
-
         # Confirm tag?
         if ext and (ext == 'confirm' or re.match("^confirm-\w+",ext)):
             confirm_cookie = ext2
@@ -446,6 +437,15 @@
                 pass
             else:
                 verify_confirm_cookie(confirm_cookie)
+                pass
+
+        # Is the sender in the WHITELIST?
+        if os.path.exists(Defaults.WHITELIST):
+            whitelist_list = []
+            whitelist_list = 
Util.file_to_list(Defaults.WHITELIST,whitelist_list)
+            if Util.findmatch(whitelist_list, EnvelopeSender,From,ReplyTo):
+                logit("OK whitelist_match", time.time())
+                sys.exit(Defaults.ERR_OK)
                 pass
             
         # Dated tag?