server: fix panic on MAIL FROM after failed EHLO

Closes: #198
emersion · Nov 9, 2023 · d62ec8c · d62ec8c
1 parent f00696d
commit d62ec8c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/conn.go b/conn.go
@@ -227,7 +227,6 @@ func (c *Conn) handleGreet(enhanced bool, arg string) {
 		c.writeResponse(501, EnhancedCode{5, 5, 2}, "Domain/address argument required for HELO")
 		return
 	}
-	c.helo = domain
 
 	sess, err := c.server.Backend.NewSession(c)
 	if err != nil {
@@ -238,6 +237,8 @@ func (c *Conn) handleGreet(enhanced bool, arg string) {
 		c.writeResponse(451, EnhancedCode{4, 0, 0}, err.Error())
 		return
 	}
+
+	c.helo = domain
 	c.setSession(sess)
 
 	if !enhanced {