Update of /cvsroot/tmda/tmda/TMDA
In directory usw-pr-cvs1:/tmp/cvs-serv31253/TMDA
Modified Files:
ChangeLog Defaults.py FilterParser.py
Log Message:
Added ability to use 'hold' as both the action part of a rule and as the
default incoming action. The 'hold' action deposits the message in the
pending/ directory but does not send a confirmation request.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- ChangeLog 13 Sep 2002 00:22:36 -0000 1.227
+++ ChangeLog 13 Sep 2002 05:42:11 -0000 1.228
@@ -11,6 +11,15 @@
* pythonlib/email: Add version 2.3 of the `email' package.
+2002-08-29 <[EMAIL PROTECTED]>
+
+ * FilterParser.py: Make the parser recognize the "hold" action by
+ adding "hold" to in_action.
+
+ * Defaults.py: Added documentation for "hold" action to
+ ACTION_INCOMING, ACTION_FAIL_DATED, ACTION_EXPIRED_DATED,
+ ACTION_FAIL_SENDER, ACTION_FAIL_KEYWORD.
+
2002-08-22 Jason R. Mastaler <[EMAIL PROTECTED]>
* SMTP.py (Connection.__connect): Add support for SSL.
Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- Defaults.py 22 Aug 2002 19:43:30 -0000 1.142
+++ Defaults.py 13 Sep 2002 05:42:11 -0000 1.143
@@ -585,6 +585,9 @@
# "confirm"
# request confirmation for the message
#
+# "hold"
+# silently hold message in pending queue
+#
# Default is confirm
if not vars().has_key('ACTION_INCOMING'):
ACTION_INCOMING = "confirm"
@@ -606,6 +609,9 @@
# "confirm"
# request confirmation for the message
#
+# "hold"
+# silently hold message in pending queue
+#
# Default is confirm
if not vars().has_key('ACTION_FAIL_DATED'):
ACTION_FAIL_DATED = "confirm"
@@ -627,6 +633,9 @@
# "confirm"
# request confirmation for the message
#
+# "hold"
+# silently hold message in pending queue
+#
# Default is confirm
if not vars().has_key('ACTION_EXPIRED_DATED'):
ACTION_EXPIRED_DATED = "confirm"
@@ -649,6 +658,9 @@
# "confirm"
# request confirmation for the message
#
+# "hold"
+# silently hold message in pending queue
+#
# Default is confirm
if not vars().has_key('ACTION_FAIL_SENDER'):
ACTION_FAIL_SENDER = "confirm"
@@ -669,6 +681,9 @@
#
# "confirm"
# request confirmation for the message
+#
+# "hold"
+# silently hold message in pending queue
#
# Default is confirm
if not vars().has_key('ACTION_FAIL_KEYWORD'):
Index: FilterParser.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/FilterParser.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- FilterParser.py 20 Aug 2002 06:49:00 -0000 1.44
+++ FilterParser.py 13 Sep 2002 05:42:11 -0000 1.45
@@ -244,7 +244,7 @@
in_action = re.compile(r"""
( bounce | reject
| drop | exit | stop
- | confirm
+ | confirm | hold
| (?: deliver | ok | accept)(?:\s*=.*$)? )
""", re.VERBOSE | re.IGNORECASE)
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
