@@ -909,7 +909,7 @@ func (c *Conn) handleData(arg string) {
909
909
}
910
910
911
911
r := newDataReader (c )
912
- code , enhancedCode , msg := toSMTPStatus (c .Session ().Data (r ))
912
+ code , enhancedCode , msg := dataErrorToStatus (c .Session ().Data (r ))
913
913
r .limited = false
914
914
io .Copy (ioutil .Discard , r ) // Make sure all the data has been consumed
915
915
c .writeResponse (code , enhancedCode , msg )
@@ -1006,7 +1006,7 @@ func (c *Conn) handleBdat(arg string) {
1006
1006
// the whole chunk.
1007
1007
io .Copy (ioutil .Discard , chunk )
1008
1008
1009
- c .writeResponse (toSMTPStatus (err ))
1009
+ c .writeResponse (dataErrorToStatus (err ))
1010
1010
1011
1011
if err == errPanic {
1012
1012
c .Close ()
@@ -1029,11 +1029,11 @@ func (c *Conn) handleBdat(arg string) {
1029
1029
if c .server .LMTP {
1030
1030
c .bdatStatus .fillRemaining (err )
1031
1031
for i , rcpt := range c .recipients {
1032
- code , enchCode , msg := toSMTPStatus (<- c .bdatStatus .status [i ])
1032
+ code , enchCode , msg := dataErrorToStatus (<- c .bdatStatus .status [i ])
1033
1033
c .writeResponse (code , enchCode , "<" + rcpt + "> " + msg )
1034
1034
}
1035
1035
} else {
1036
- c .writeResponse (toSMTPStatus (err ))
1036
+ c .writeResponse (dataErrorToStatus (err ))
1037
1037
}
1038
1038
1039
1039
if err == errPanic {
@@ -1168,7 +1168,7 @@ func (c *Conn) handleDataLMTP() {
1168
1168
}
1169
1169
1170
1170
for i , rcpt := range c .recipients {
1171
- code , enchCode , msg := toSMTPStatus (<- status .status [i ])
1171
+ code , enchCode , msg := dataErrorToStatus (<- status .status [i ])
1172
1172
c .writeResponse (code , enchCode , "<" + rcpt + "> " + msg )
1173
1173
}
1174
1174
@@ -1179,7 +1179,7 @@ func (c *Conn) handleDataLMTP() {
1179
1179
}
1180
1180
}
1181
1181
1182
- func toSMTPStatus (err error ) (code int , enchCode EnhancedCode , msg string ) {
1182
+ func dataErrorToStatus (err error ) (code int , enchCode EnhancedCode , msg string ) {
1183
1183
if err != nil {
1184
1184
if smtperr , ok := err .(* SMTPError ); ok {
1185
1185
return smtperr .Code , smtperr .EnhancedCode , smtperr .Message
0 commit comments