Skip to content

Commit

Permalink
Use server hostname to replace client hostname
Browse files Browse the repository at this point in the history
  • Loading branch information
linanh committed Apr 17, 2021
1 parent 0bad99e commit 549f7b6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func (c *Conn) handleGreet(enhanced bool, arg string) {
}
c.helo = domain

c.WriteResponse(250, EnhancedCode{2, 0, 0}, fmt.Sprintf("Hello %s", domain))
c.WriteResponse(250, EnhancedCode{2, 0, 0}, c.server.Domain)
} else {
domain, err := parseHelloArgument(arg)
if err != nil {
Expand Down Expand Up @@ -339,7 +339,7 @@ func (c *Conn) handleGreet(enhanced bool, arg string) {
caps = append(caps, "XCLIENT ADDR PORT DESTADDR DESTPORT HELO PROTO")
}

args := []string{"Hello " + domain}
args := []string{c.server.Domain}
args = append(args, caps...)
c.WriteResponse(250, NoEnhancedCode, args...)
}
Expand Down Expand Up @@ -776,7 +776,7 @@ func (c *Conn) handleStartTLS() {
tlsConn := tls.Server(c.conn, c.server.TLSConfig)

if err := tlsConn.Handshake(); err != nil {
c.server.Logger.Warnf("smtp/server sid=%s reject: TLS handshake error %v", c.sid, err)
c.server.Logger.Infof("smtp/server sid=%s reject: TLS handshake error %v", c.sid, err)
c.WriteResponse(550, EnhancedCode{5, 0, 0}, "Handshake error")
}

Expand Down

0 comments on commit 549f7b6

Please sign in to comment.