Fix incorrect delivery-status Content-Type.

diff --git a/smtp/relay.go b/smtp/relay.go
index 53ebe1562136773802259183795ab9ea683c103e..81a91e3e449f740a52df00300ddab81a304570a7 100644 (file)
--- a/smtp/relay.go
+++ b/smtp/relay.go
@@ -127,7 +127,7 @@ func deliverRelayFailure(server Server, env Envelope, log *zap.Logger, to, error
        fmt.Fprintf(tw, "The server failed to relay the message:\n\n%s:\n%s\n", errorStr, sendErr.Error())
 
        sw, err := mw.CreatePart(textproto.MIMEHeader{
-               "Content-Type": []string{"delivery-status"},
+               "Content-Type": []string{"message/delivery-status"},
        })
        if err != nil {
                log.Error("failed to create multipart 1", zap.Error(err))

diff --git a/smtp/relay_test.go b/smtp/relay_test.go
index e9f0c15cbd8235428a07b348cd66f9ce5cfcff18..e486e8271950c74c9856ed0b9f0e1d50153e8213 100644 (file)
--- a/smtp/relay_test.go
+++ b/smtp/relay_test.go
@@ -169,7 +169,7 @@ func TestDeliveryFailureMessage(t *testing.T) {
                return
        }
 
-       expected = "delivery-status"
+       expected = "message/delivery-status"
        if part.Header["Content-Type"][0] != expected {
                t.Errorf("Part 1 type expected %q, got %q", expected, part.Header["Content-Type"][0])
        }