From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 24 May 2020 05:39:12 +0000 (-0400)
Subject: Merge branch 'master' into outbound
X-Git-Tag: v2.0.0-beta.1~1
X-Git-Url: https://src.bluestatic.org/?a=commitdiff_plain;h=7ed0c207598c01f6716d231a8a8b1fd36b4c9523;p=mailpopbox.git

Merge branch 'master' into outbound
---

7ed0c207598c01f6716d231a8a8b1fd36b4c9523
diff --cc smtp.go
index fe0c4b5,14ead8f..2a27279
--- a/smtp.go
+++ b/smtp.go
@@@ -7,8 -13,9 +13,8 @@@ import 
  	"net/mail"
  	"os"
  	"path"
 -	"strings"
  
- 	"github.com/uber-go/zap"
+ 	"go.uber.org/zap"
  
  	"src.bluestatic.org/mailpopbox/smtp"
  )
diff --cc smtp/conn.go
index eb868e4,94db8a8..ec1644e
--- a/smtp/conn.go
+++ b/smtp/conn.go
@@@ -56,12 -40,8 +62,12 @@@ type connection struct 
  	esmtp bool
  	tls   *tls.ConnectionState
  
+ 	log *zap.Logger
+ 
 +	// The authcid from a PLAIN SASL login. Non-empty iff tls is non-nil and
 +	// doAUTH() succeeded.
 +	authc string
 +
- 	log zap.Logger
- 
  	state
  	line string