Index: bin/tmda-rfilter
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-rfilter,v
retrieving revision 1.81
diff -u -r1.81 tmda-rfilter
--- bin/tmda-rfilter	4 Mar 2003 22:16:33 -0000	1.81
+++ bin/tmda-rfilter	31 Mar 2003 10:42:13 -0000
@@ -40,6 +40,10 @@
 	--discard
 	   Discard message if address is invalid instead of bouncing it.
 
+        -D
+	--delivery
+	   set DELIVERY (final delivery destination) variable on the command line
+
         -t <dir>
         --template-dir <dir>
 	   Full pathname to a directory containing custom TMDA templates.
@@ -84,8 +88,9 @@
     
 try:
     opts, args = getopt.getopt(sys.argv[1:],
-                               'c:dt:I:M:Vh', ['config-file=',
+                               'c:dD:t:I:M:Vh', ['config-file=',
                                                'discard',
+                                               'delivery=',
                                                'template-dir=',
                                                'filter-incoming-file=',
                                                'filter-match=',
@@ -94,6 +99,7 @@
 except getopt.error, msg:
     usage(1, msg)
 
+
 for opt, arg in opts:
     if opt in ('-h', '--help'):
         usage(0)
@@ -109,12 +115,13 @@
 	os.environ['TMDA_FILTER_INCOMING'] = arg
     elif opt in ('-t', '--template-dir'):
         os.environ['TMDA_TEMPLATE_DIR'] = arg
+    elif opt in ('-D', '--delivery'):
+        delivery_temp = arg
     elif opt in ('-d', '--discard'):
 	discard = 1
     elif opt in ('-c', '--config-file'):
         os.environ['TMDARC'] = arg
 
-
 from TMDA import Defaults
 from TMDA import Cookie
 from TMDA import Errors
@@ -122,6 +129,8 @@
 from TMDA import MTA
 from TMDA import Util
 
+if vars().has_key('delivery_temp'):
+    Defaults.DELIVERY = delivery_temp
 
 from cStringIO import StringIO
 from email.Utils import parseaddr, getaddresses