turned CURLOPT_MAIL_RCPT into a curl_slist list instead to support multiple

receivers, and made the command line tool thus support the option specified
many times

1 files changed, 17 insertions, 2 deletions

diff --git a/lib/smtp.c b/lib/smtp.c
index 5dd90298b..0f34c4f9e 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -345,8 +345,23 @@ static CURLcode smtp_state_mail_resp(struct connectdata *conn,
   }
   else {
     /* send RCPT TO */
-    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",
-                           data->set.str[STRING_MAIL_RCPT]);
+    struct curl_slist *rcpt;
+    char *buffer = NULL;
+
+    for(rcpt = data->set.mail_rcpt; rcpt; rcpt=rcpt->next) {
+      char *add = aprintf("%s%s%s", buffer?buffer:"", buffer?", ":"",
+                          rcpt->data);
+      if(!add) {
+        free(buffer);
+        return CURLE_OUT_OF_MEMORY;
+      }
+      buffer = add;
+    }
+
+    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s", buffer);
+
+    free(buffer);
+
     if(result)
       return result;