1.1 --- a/imiptools/__init__.py Thu Aug 20 23:52:18 2015 +0200
1.2 +++ b/imiptools/__init__.py Fri Aug 21 14:47:53 2015 +0200
1.3 @@ -111,6 +111,7 @@
1.4 store_dir = []
1.5 publishing_dir = []
1.6 preferences_dir = []
1.7 + local_smtp = False
1.8 outgoing_only = False
1.9
1.10 l = []
1.11 @@ -124,7 +125,7 @@
1.12
1.13 # Switch to collecting recipients.
1.14
1.15 - if arg == "-o":
1.16 + elif arg == "-o":
1.17 l = original_recipients
1.18
1.19 # Switch to collecting senders.
1.20 @@ -137,6 +138,11 @@
1.21 elif arg == "-l":
1.22 l = lmtp
1.23
1.24 + # Detect sending to local users via SMTP.
1.25 +
1.26 + elif arg == "-L":
1.27 + local_smtp = True
1.28 +
1.29 # Switch to getting the store directory.
1.30
1.31 elif arg == "-S":
1.32 @@ -159,7 +165,7 @@
1.33 else:
1.34 l.append(arg)
1.35
1.36 - self.messenger = Messenger(lmtp_socket=lmtp and lmtp[0] or None, sender=senders and senders[0] or None)
1.37 + self.messenger = Messenger(lmtp_socket=lmtp and lmtp[0] or None, local_smtp=local_smtp, sender=senders and senders[0] or None)
1.38 self.store_dir = store_dir and store_dir[0] or None
1.39 self.publishing_dir = publishing_dir and publishing_dir[0] or None
1.40 self.preferences_dir = preferences_dir and preferences_dir[0] or None
1.41 @@ -317,7 +323,7 @@
1.42 print >>sys.stderr, "Forwarded parts..."
1.43 print message
1.44 elif self.messenger.local_delivery():
1.45 - self.messenger.sendmail(get_address(self.user), message.as_string())
1.46 + self.messenger.sendmail([get_address(self.user)], message.as_string())
1.47
1.48 # Unhandled messages are delivered as they are.
1.49
1.50 @@ -326,7 +332,7 @@
1.51 print >>sys.stderr, "Unhandled parts..."
1.52 print msg
1.53 elif self.messenger.local_delivery():
1.54 - self.messenger.sendmail(get_address(self.user), msg.as_string())
1.55 + self.messenger.sendmail([get_address(self.user)], msg.as_string())
1.56
1.57 def can_provide_freebusy(self, handlers):
1.58