From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 7 Jan 2012 13:42:28 +0000 (+0000)
Subject: smtp.c: Fixed use of angled brackets in AUTH parameter.
X-Git-Tag: curl-7_25_0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b685481d527309d595ebf3551048a9f96975dc9e;p=thirdparty%2Fcurl.git

smtp.c: Fixed use of angled brackets in AUTH parameter.

Fixed the use of angled brackets "<>" in the optional AUTH parameter as
per RFC-2554 section 5. The address should not include them but an
empty address should be replaced by them.
---

diff --git a/lib/smtp.c b/lib/smtp.c
index c02c9bdd46..fa5452affc 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -912,10 +912,11 @@ static CURLcode smtp_mail(struct connectdata *conn)
 
   /* calculate the optional AUTH parameter */
   if(data->set.str[STRING_MAIL_AUTH] && conn->proto.smtpc.authused) {
-    if(data->set.str[STRING_MAIL_AUTH][0] == '<')
+    if(data->set.str[STRING_MAIL_AUTH][0] != '\0')
       auth = aprintf("%s", data->set.str[STRING_MAIL_AUTH]);
     else
-      auth = aprintf("<%s>", data->set.str[STRING_MAIL_AUTH]);
+      /* empty AUTH, RFC-2554, sect. 5 */
+      auth = strdup("<>");
 
     if(!auth) {
       Curl_safefree(from);