From: Brad Hards <bradh@frogmouth.net>
Date: Wed, 22 Dec 2010 13:41:53 +0000 (+0100)
Subject: SMTP: add brackets for MAIL FROM
X-Git-Tag: curl-7_21_4~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=375aa41ba1ebde3ef130a801fab2dca1aef641a6;p=thirdparty%2Fcurl.git

SMTP: add brackets for MAIL FROM

Similar to what is done already for RCPT TO, the code now checks for and
adds angle brackets (<>) around the email address that is provided for
CURLOPT_MAIL_RCPT unless the app has done so itself.
---

diff --git a/lib/smtp.c b/lib/smtp.c
index 82621a42b7..b01ad7d5c1 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -754,9 +754,13 @@ static CURLcode smtp_mail(struct connectdata *conn)
   CURLcode result = CURLE_OK;
   struct SessionHandle *data = conn->data;
 
-  /* send MAIL */
-  result = Curl_pp_sendf(&conn->proto.smtpc.pp, "MAIL FROM:%s",
-                         data->set.str[STRING_MAIL_FROM]);
+  /* send MAIL FROM */
+  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
+    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "MAIL FROM:<%s>",
+                           data->set.str[STRING_MAIL_FROM]);
   if(result)
     return result;