From 1856deae46662bc20909328286e23eed6a3385ec Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Sun, 18 Sep 2016 17:45:03 -0700
Subject: [PATCH] SMTP handler is now more forgiving of line endings, a la
 Postfix

---
 smtpd/filestore.go |  2 +-
 smtpd/handler.go   | 20 ++++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/smtpd/filestore.go b/smtpd/filestore.go
index 81d9bfd..dc46141 100644
--- a/smtpd/filestore.go
+++ b/smtpd/filestore.go
@@ -23,7 +23,7 @@ const indexFileName = "index.gob"
 var (
 	// indexLock is locked while reading/writing an index file
 	//
-	// NOTE: This is a bottleneck because  it's a single lock even if we have a
+	// NOTE: This is a bottleneck because it's a single lock even if we have a
 	// million index files
 	indexLock = new(sync.RWMutex)
 
diff --git a/smtpd/handler.go b/smtpd/handler.go
index 8cafbb5..a9b49a1 100644
--- a/smtpd/handler.go
+++ b/smtpd/handler.go
@@ -393,7 +393,8 @@ func (ss *Session) dataHandler() {
 			return
 		}
 		line := lineBuf.Bytes()
-		if string(line) == ".\r\n" {
+		// ss.logTrace("DATA: %q", line)
+		if string(line) == ".\r\n" || string(line) == ".\n" {
 			// Mail data complete
 			if ss.server.storeMessages {
 				// Create a message for each valid recipient
@@ -492,28 +493,15 @@ func (ss *Session) readByteLine(buf *bytes.Buffer) error {
 		return err
 	}
 	for {
-		line, err := ss.reader.ReadBytes('\r')
+		line, err := ss.reader.ReadBytes('\n')
 		if err != nil {
 			return err
 		}
 		if _, err = buf.Write(line); err != nil {
 			return err
 		}
-		// Read the next byte looking for '\n'
-		c, err := ss.reader.ReadByte()
-		if err != nil {
-			return err
-		}
-		if err = buf.WriteByte(c); err != nil {
-			return err
-		}
-		if c == '\n' {
-			// We've reached the end of the line, return
-			return nil
-		}
-		// Else, keep looking
+		return nil
 	}
-	// Should be unreachable
 }
 
 // Reads a line of input