From: Steve Holme Date: Sun, 6 Jan 2013 22:32:05 +0000 (+0000) Subject: smtp.c: Small code tidy up following imap changes X-Git-Tag: curl-7_29_0~128 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70dcde78d0ad6bd16f7652b184328fd5c3c1119c;p=thirdparty%2Fcurl.git smtp.c: Small code tidy up following imap changes --- diff --git a/lib/smtp.c b/lib/smtp.c index a1840a434f..9a759abca1 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -22,6 +22,7 @@ * RFC3207 SMTP over TLS * RFC4954 SMTP Authentication * RFC2195 CRAM-MD5 authentication + * RFC2222 Simple Authentication and Security Layer (SASL) * RFC2831 DIGEST-MD5 authentication * RFC4616 PLAIN authentication * @@ -218,6 +219,7 @@ static int smtp_endofresp(struct pingpong *pp, int *resp) if(len < 4 || !ISDIGIT(line[0]) || !ISDIGIT(line[1]) || !ISDIGIT(line[2])) return FALSE; /* Nothing for us */ + /* Extract the response code if necessary */ if((result = (line[3] == ' ')) != 0) *resp = curlx_sltosi(strtol(line, NULL, 10)); @@ -319,7 +321,7 @@ static CURLcode smtp_state_ehlo(struct connectdata *conn) smtpc->authused = 0; /* Clear the authentication mechanism used for esmtp connections */ - /* send EHLO */ + /* Send the EHLO command */ result = Curl_pp_sendf(&smtpc->pp, "EHLO %s", smtpc->domain); if(result) @@ -338,7 +340,7 @@ static CURLcode smtp_state_helo(struct connectdata *conn) smtpc->authused = 0; /* No authentication mechanism used in smtp connections */ - /* send HELO */ + /* Send the HELO command */ result = Curl_pp_sendf(&smtpc->pp, "HELO %s", smtpc->domain); if(result)