svn commit: r441604 - head/mail/cyrus-imapd24/files

[Hajimu UMEMOTO]

Author: ume
Date: Wed May 24 15:09:56 2017
New Revision: 441604
URL: https://svnweb.freebsd.org/changeset/ports/441604

Log:
  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

Added:
  head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c   (contents, props changed)

Added: head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c	Wed May 24 15:09:56 2017	(r441604)
@@ -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 */