From 8697f0ab99257fde99c3fc560b3a1cdb10e49f2b Mon Sep 17 00:00:00 2001 From: Rob Funk Date: Wed, 21 Jul 2004 17:05:58 +0000 Subject: Remove space after "MAIL FROM:" (patch from Phil Endecott) svn path=/trunk/; revision=3925 --- sink.c | 2 +- smtp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sink.c b/sink.c index c8c8fd9f..adf95973 100644 --- a/sink.c +++ b/sink.c @@ -721,7 +721,7 @@ static int open_bsmtp_sink(struct query *ctl, struct msgblk *msg, /* see the ap computation under the SMTP branch */ fprintf(sinkfp, - "MAIL FROM: %s", (msg->return_path[0]) ? msg->return_path : user); + "MAIL FROM:%s", (msg->return_path[0]) ? msg->return_path : user); if (ctl->pass8bits || (ctl->mimemsg & MSG_IS_8BIT)) fputs(" BODY=8BITMIME", sinkfp); diff --git a/smtp.c b/smtp.c index fd987950..2595a57e 100644 --- a/smtp.c +++ b/smtp.c @@ -232,13 +232,13 @@ int SMTP_from(int sock, const char *from, const char *opts) int ok; char buf[MSGBUFSIZE]; - if (strchr(from, '<')) + if (from[0]=='<') #ifdef HAVE_SNPRINTF snprintf(buf, sizeof(buf), #else sprintf(buf, #endif /* HAVE_SNPRINTF */ - "MAIL FROM: %s", from); + "MAIL FROM:%s", from); else #ifdef HAVE_SNPRINTF snprintf(buf, sizeof(buf), -- cgit v1.2.3