summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2017-05-24 15:09:56 +0000
committerume <ume@FreeBSD.org>2017-05-24 15:09:56 +0000
commit2f94cd33fa1f98b5fa4e34251002de995d206af3 (patch)
tree220b4157c9096901f361f668a74c6d52b3056fd2
parent54e3fd0d3a70bef904021f045c615d0a212faa1b (diff)
downloadFreeBSD-ports-2f94cd33fa1f98b5fa4e34251002de995d206af3.zip
FreeBSD-ports-2f94cd33fa1f98b5fa4e34251002de995d206af3.tar.gz
Fix delivering the messages into the local mailbox by lmtpd.
PR: 219494 Obtained from: http://asg.andrew.cmu.edu/archive/message.php?mailbox=archive.info-cyrus&msg=57396
-rw-r--r--mail/cyrus-imapd24/files/patch-imap__lmtpd.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/mail/cyrus-imapd24/files/patch-imap__lmtpd.c b/mail/cyrus-imapd24/files/patch-imap__lmtpd.c
new file mode 100644
index 0000000..14701d9
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-imap__lmtpd.c
@@ -0,0 +1,34 @@
+--- imap/lmtpd.c.orig 2017-05-15 05:43:30 UTC
++++ imap/lmtpd.c
+@@ -712,9 +712,10 @@ int deliver(message_data_t *msgdata, cha
+
+ /* loop through each recipient, attempting delivery for each */
+ for (n = 0; n < nrcpts; n++) {
+- char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
++ char namebuf[MAX_MAILBOX_BUFFER] = "";
+ char userbuf[MAX_MAILBOX_BUFFER];
+ const char *rcpt, *user, *domain, *mailbox;
++ char *server = NULL;
+ int r = 0;
+
+ rcpt = msg_getrcptall(msgdata, n);
+@@ -954,7 +955,7 @@ static int verify_user(const char *user,
+ }
+
+ if (!r) {
+- char *server, *acl;
++ char *server = NULL, *acl = NULL;
+ long aclcheck = !user ? ACL_POST : 0;
+ /*
+ * check to see if mailbox exists and we can append to it:
+@@ -1061,8 +1062,9 @@ FILE *spoolfile(message_data_t *msgdata)
+ (don't bother if we're only a proxy) */
+ n = isproxy ? 0 : msg_getnumrcpt(msgdata);
+ for (i = 0; !f && (i < n); i++) {
+- char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
++ char namebuf[MAX_MAILBOX_BUFFER] = "";
+ const char *user, *domain, *mailbox;
++ char *server = NULL;
+ int r;
+
+ /* build the mailboxname from the recipient address */
OpenPOWER on IntegriCloud