spool.c: bzero contents of pointer

[people/ms/dma.git] / mail.c

diff --git a/mail.c b/mail.c
index e0a22af19c8d55a57a21711525a4158aa506a2ad..9cbde41d98f1331e093952d4023fab4ffaf35ab2 100644 (file)
--- a/mail.c
+++ b/mail.c
@@ -57,7 +57,7 @@ bounce(struct qitem *it, const char *reason)
        bzero(&bounceq, sizeof(bounceq));
        LIST_INIT(&bounceq.queue);
        bounceq.sender = "";
-       if (add_recp(&bounceq, it->sender, 1) != 0)
+       if (add_recp(&bounceq, it->sender, EXPAND_WILDCARD) != 0)
                goto fail;
 
        if (newspoolf(&bounceq) != 0)
@@ -69,7 +69,7 @@ bounce(struct qitem *it, const char *reason)
        error = fprintf(bounceq.mailf,
                "Received: from MAILER-DAEMON\n"
                "\tid %s\n"
-               "\tby %s (%s)\n"
+               "\tby %s (%s);\n"
                "\t%s\n"
                "X-Original-To: <%s>\n"
                "From: MAILER-DAEMON <>\n"
@@ -334,7 +334,7 @@ newaddr:
        if (addr == NULL)
                errlog(1, NULL);
 
-       if (add_recp(queue, addr, 1) != 0)
+       if (add_recp(queue, addr, EXPAND_WILDCARD) != 0)
                errlogx(1, "invalid recipient `%s'", addr);
 
        goto again;
@@ -360,7 +360,7 @@ readmail(struct queue *queue, int nodot, int recp_from_header)
                "Received: from %s (uid %d)\n"
                "\t(envelope-from %s)\n"
                "\tid %s\n"
-               "\tby %s (%s)\n"
+               "\tby %s (%s);\n"
                "\t%s\n",
                username, useruid,
                queue->sender,