1.1 --- a/conf/postfix/master.cf.items Mon May 11 22:13:58 2015 +0200
1.2 +++ b/conf/postfix/master.cf.items Tue May 12 15:36:02 2015 +0200
1.3 @@ -1,9 +1,9 @@
1.4 imip_resources unix - n n - - pipe
1.5 flags=FR user=imip-agent:lmtp argv=/var/lib/imip-agent/imip_resource.py
1.6 - -o ${original_recipient} -r ${recipient}
1.7 + -o ${original_recipient}
1.8 imip_people unix - n n - - pipe
1.9 flags=FR user=imip-agent:lmtp argv=/var/lib/imip-agent/imip_person.py
1.10 - -o ${original_recipient} -r ${recipient} -l $lmtp_socket
1.11 + -o ${original_recipient} -l $lmtp_socket
1.12 imip_people_outgoing unix - n n - - pipe
1.13 flags=FR user=imip-agent:lmtp argv=/var/lib/imip-agent/imip_person_outgoing.py
1.14 -O
2.1 --- a/imiptools/__init__.py Mon May 11 22:13:58 2015 +0200
2.2 +++ b/imiptools/__init__.py Tue May 12 15:36:02 2015 +0200
2.3 @@ -56,11 +56,11 @@
2.4 self.messenger = messenger or Messenger()
2.5 self.lmtp_socket = None
2.6
2.7 - def process(self, f, original_recipients, recipients, outgoing_only):
2.8 + def process(self, f, original_recipients, outgoing_only):
2.9
2.10 """
2.11 Process content from the stream 'f' accompanied by the given
2.12 - 'original_recipients' and 'recipients'.
2.13 + 'original_recipients'.
2.14 """
2.15
2.16 msg = message_from_file(f)
2.17 @@ -253,8 +253,6 @@
2.18
2.19 if arg == "-o":
2.20 l = original_recipients
2.21 - elif arg == "-r":
2.22 - l = recipients
2.23
2.24 # Switch to collecting senders.
2.25
2.26 @@ -275,7 +273,7 @@
2.27
2.28 self.messenger.sender = senders and senders[0] or self.messenger.sender
2.29 self.lmtp_socket = lmtp and lmtp[0] or None
2.30 - self.process(stream, original_recipients, recipients, outgoing_only)
2.31 + self.process(stream, original_recipients, outgoing_only)
2.32
2.33 def __call__(self):
2.34