diff options
| author | Brad Hards <bradh@frogmouth.net> | 2010-12-22 14:41:53 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-12-22 14:41:53 +0100 |
| commit | 375aa41ba1ebde3ef130a801fab2dca1aef641a6 (patch) | |
| tree | 3b8cf2152d13c1b9261b7c28690cc5d2c9f3cd53 /lib | |
| parent | 5f829456c1d2b5a13146b7fb41c88389568e5db1 (diff) | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/smtp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index 82621a42b..b01ad7d5c 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; |