Allow the '<>' null sender.
This commit is contained in:
parent
c009354c02
commit
eb300d92cc
1 changed files with 11 additions and 5 deletions
16
protocol.go
16
protocol.go
|
@ -212,11 +212,17 @@ func (session *session) handleMAIL(cmd command) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
addr, err := parseAddress(cmd.params[1])
|
var err error
|
||||||
|
addr := "" // null sender
|
||||||
|
|
||||||
if err != nil {
|
// We must accept a null sender as per rfc5321 section-6.1.
|
||||||
session.reply(502, "Ill-formatted e-mail address")
|
if cmd.params[1] != "<>" {
|
||||||
return
|
addr, err = parseAddress(cmd.params[1])
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
session.reply(502, "Malformed e-mail address")
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if session.server.SenderChecker != nil {
|
if session.server.SenderChecker != nil {
|
||||||
|
@ -256,7 +262,7 @@ func (session *session) handleRCPT(cmd command) {
|
||||||
addr, err := parseAddress(cmd.params[1])
|
addr, err := parseAddress(cmd.params[1])
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
session.reply(502, "Ill-formatted e-mail address")
|
session.reply(502, "Malformed e-mail address")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue