changeset 910:6c6a12e856f6

Fix some RFC 5321 compliance issues (Martijn Grendelman).
author Ben Schmidt
date Tue, 10 May 2016 13:58:04 +1000
parents 4bcd0168ddf9
children cdc36c8358a0
files ChangeLog src/mail-functions.c
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 10 13:33:29 2016 +1000
+++ b/ChangeLog	Tue May 10 13:58:04 2016 +1000
@@ -1,3 +1,4 @@
+ o Fix some RFC 5321 compliance issues (Martijn Grendelman)
  o Add smtphelo tunable (Andreas Schulze)
  o Implement modonlypost
 1.2.19.0
--- a/src/mail-functions.c	Tue May 10 13:33:29 2016 +1000
+++ b/src/mail-functions.c	Tue May 10 13:58:04 2016 +1000
@@ -85,8 +85,8 @@
 	myfree(helo);
 	return 0;
 }
-/* "MAIL FROM: <> \r\n" has length 16 */
-#define EXTRA_FROM_LEN 16
+/* "MAIL FROM:<> \r\n" has length 15 */
+#define EXTRA_FROM_LEN 15
 int write_mail_from(int sockfd, const char *from_addr, const char *extra)
 {
 	size_t len = (size_t)(strlen(from_addr) + EXTRA_FROM_LEN +
@@ -118,8 +118,8 @@
 	return 0;
 }
 
-/* "RCPT TO: <>\r\n" has length 13 */
-#define EXTRA_RCPT_LEN 13
+/* "RCPT TO:<>\r\n" has length 12 */
+#define EXTRA_RCPT_LEN 12
 int write_rcpt_to(int sockfd, const char *rcpt_addr)
 {
 	size_t len = (size_t)(strlen(rcpt_addr) + EXTRA_RCPT_LEN + 1);