From f50061ac8211119a3d8484b5b34b5be1bf607b17 Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Fri, 13 Sep 2013 09:01:36 -0700
Subject: [PATCH] Handle space after "MAIL FROM:" for Outlook SMTP

---
 smtpd/handler.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smtpd/handler.go b/smtpd/handler.go
index 918df0a..d591cb4 100644
--- a/smtpd/handler.go
+++ b/smtpd/handler.go
@@ -212,7 +212,7 @@ func (ss *Session) greetHandler(cmd string, arg string) {
 func (ss *Session) readyHandler(cmd string, arg string) {
 	if cmd == "MAIL" {
 		// (?i) makes the regex case insensitive
-		re := regexp.MustCompile("(?i)^FROM:<([^>]+)>( [\\w= ]+)?$")
+		re := regexp.MustCompile("(?i)^FROM:\\s*<([^>]+)>( [\\w= ]+)?$")
 		m := re.FindStringSubmatch(arg)
 		if m == nil {
 			ss.send("501 Was expecting MAIL arg syntax of FROM:<address>")