From 322f3d5af7093dc0c7277cb662b6fe5cae59a1c5 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Wed, 21 Sep 2011 22:24:45 +0200 Subject: smtp: without a MAIL_FROM, send blank MAIL FROM I think curl should ignore this case and smtp.c should test for this. Since RFC-2821 seems to allow a "null reverse-path". Ref. "MAIL FROM:<>" in section 3.7, page 25. --- lib/smtp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/smtp.c b/lib/smtp.c index 977d323a7..bb29a83cf 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -791,7 +791,11 @@ static CURLcode smtp_mail(struct connectdata *conn) struct SessionHandle *data = conn->data; /* send MAIL FROM */ - if(data->set.str[STRING_MAIL_FROM][0] == '<') + if(!data->set.str[STRING_MAIL_FROM]) + /* null reverse-path, RFC-2821, sect. 3.7 */ + result = Curl_pp_sendf(&conn->proto.smtpc.pp, "MAIL FROM:<>"); + + else if(data->set.str[STRING_MAIL_FROM][0] == '<') result = Curl_pp_sendf(&conn->proto.smtpc.pp, "MAIL FROM:%s", data->set.str[STRING_MAIL_FROM]); else -- cgit v1.2.3