CVS: tmda/bin tmda-ofmipd,1.35,1.36

Update of /cvsroot/tmda/tmda/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv20654

Modified Files:
	tmda-ofmipd 
Log Message:
Use Util.getvdomainprepend rather than importing MTA.py.


Index: tmda-ofmipd
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-ofmipd,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tmda-ofmipd	1 May 2003 01:07:12 -0000	1.35
+++ tmda-ofmipd	25 May 2003 02:11:13 -0000	1.36
@@ -1096,11 +1096,6 @@
     (VPopMail or VMailMgr) environment.  It needs to behave differently from
     the standard TMDA proxy in that authenticated users are not system
     (/etc/passwd) users."""
-    def __init__(self, localaddr, remoteaddr):
-        from TMDA.MTA import Qmail
-        self._mta = Qmail('_qok_')
-        PureProxy.__init__(self, localaddr, remoteaddr)
-
     def process_message(self, peer, mailfrom, rcpttos, data, auth_username):
         # Set the TCPLOCALIP environment variable to support VPopMail's reverse
         # IP domain mapping.
@@ -1129,8 +1124,7 @@
             else:
                 # The 'prepend' is the system user in charge of this virtual
                 # domain.
-                prepend = self._mta.getvdomainprepend(auth_username,
-                                                      vdomainspath)
+                prepend = Util.getvdomainprepend(auth_username, vdomainspath)
                 if not prepend:
                     err = 'Error: "%s" is not a virtual domain' % (domain,)
                     print >> DEBUGSTREAM, err

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs