From: Daniel Stenberg Date: Mon, 29 May 2023 13:25:26 +0000 (+0200) Subject: CURLOPT_MAIL_RCPT_ALLOWFAILS: replace CURLOPT_MAIL_RCPT_ALLLOWFAILS X-Git-Tag: curl-8_2_0~159 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fff65550bc2df4daeb8bde5b48c48183c00c51cf;p=thirdparty%2Fcurl.git CURLOPT_MAIL_RCPT_ALLOWFAILS: replace CURLOPT_MAIL_RCPT_ALLLOWFAILS Deprecate the name using three Ls and prefer the name with two. Replaces #10047 Closes #11218 --- diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index aed4148845..b7257c425c 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -392,8 +392,9 @@ Address of the sender. See \fICURLOPT_MAIL_FROM(3)\fP Address of the recipients. See \fICURLOPT_MAIL_RCPT(3)\fP .IP CURLOPT_MAIL_AUTH Authentication address. See \fICURLOPT_MAIL_AUTH(3)\fP -.IP CURLOPT_MAIL_RCPT_ALLLOWFAILS -Allow RCPT TO command to fail for some recipients. See \fICURLOPT_MAIL_RCPT_ALLLOWFAILS(3)\fP +.IP CURLOPT_MAIL_RCPT_ALLOWFAILS +Allow RCPT TO command to fail for some recipients. See +\fICURLOPT_MAIL_RCPT_ALLOWFAILS(3)\fP .SH TFTP OPTIONS .IP CURLOPT_TFTP_BLKSIZE TFTP block size. See \fICURLOPT_TFTP_BLKSIZE(3)\fP diff --git a/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 b/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLOWFAILS.3 similarity index 87% rename from docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 rename to docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLOWFAILS.3 index feed0dc9af..981e8b2fd4 100644 --- a/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 +++ b/docs/libcurl/opts/CURLOPT_MAIL_RCPT_ALLOWFAILS.3 @@ -22,14 +22,14 @@ .\" * .\" ************************************************************************** .\" -.TH CURLOPT_MAIL_RCPT_ALLLOWFAILS 3 "16 Jan 2020" libcurl libcurl +.TH CURLOPT_MAIL_RCPT_ALLOWFAILS 3 "16 Jan 2020" libcurl libcurl .SH NAME -CURLOPT_MAIL_RCPT_ALLLOWFAILS \- allow RCPT TO command to fail for some recipients +CURLOPT_MAIL_RCPT_ALLOWFAILS \- allow RCPT TO command to fail for some recipients .SH SYNOPSIS .nf #include -CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAIL_RCPT_ALLLOWFAILS, +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAIL_RCPT_ALLOWFAILS, long allow); .SH DESCRIPTION If \fIallow\fP is set to 1L, allow RCPT TO command to fail for some recipients. @@ -59,7 +59,7 @@ if(curl) { list = curl_slist_append(list, "invalidemailaddress"); curl_easy_setopt(curl, CURLOPT_URL, "smtp://example.com/"); - curl_easy_setopt(curl, CURLOPT_MAIL_RCPT_ALLLOWFAILS, 1L); + curl_easy_setopt(curl, CURLOPT_MAIL_RCPT_ALLOWFAILS, 1L); ret = curl_easy_perform(curl); curl_slist_free_all(list); @@ -67,6 +67,8 @@ if(curl) { } .fi .SH AVAILABILITY +This option was called CURLOPT_MAIL_RCPT_ALLLOWFAILS before 8.2.0 + Added in 7.69.0. .SH RETURN VALUE Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. diff --git a/docs/libcurl/opts/Makefile.inc b/docs/libcurl/opts/Makefile.inc index a4a028c2d4..d4da3167f9 100644 --- a/docs/libcurl/opts/Makefile.inc +++ b/docs/libcurl/opts/Makefile.inc @@ -228,7 +228,7 @@ man_MANS = \ CURLOPT_MAIL_AUTH.3 \ CURLOPT_MAIL_FROM.3 \ CURLOPT_MAIL_RCPT.3 \ - CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 \ + CURLOPT_MAIL_RCPT_ALLOWFAILS.3 \ CURLOPT_MAX_RECV_SPEED_LARGE.3 \ CURLOPT_MAX_SEND_SPEED_LARGE.3 \ CURLOPT_MAXAGE_CONN.3 \ diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 0398e93cda..d82401f38b 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -688,7 +688,8 @@ CURLOPT_LOW_SPEED_TIME 7.1 CURLOPT_MAIL_AUTH 7.25.0 CURLOPT_MAIL_FROM 7.20.0 CURLOPT_MAIL_RCPT 7.20.0 -CURLOPT_MAIL_RCPT_ALLLOWFAILS 7.69.0 +CURLOPT_MAIL_RCPT_ALLLOWFAILS 7.69.0 8.2.0 +CURLOPT_MAIL_RCPT_ALLOWFAILS 8.2.0 CURLOPT_QUICK_EXIT 7.87.0 CURLOPT_MAX_RECV_SPEED_LARGE 7.15.5 CURLOPT_MAX_SEND_SPEED_LARGE 7.15.5 diff --git a/include/curl/curl.h b/include/curl/curl.h index 9443524216..e033361a8d 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2113,7 +2113,7 @@ typedef enum { CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289), /* allow RCPT TO command to fail for some recipients */ - CURLOPT(CURLOPT_MAIL_RCPT_ALLLOWFAILS, CURLOPTTYPE_LONG, 290), + CURLOPT(CURLOPT_MAIL_RCPT_ALLOWFAILS, CURLOPTTYPE_LONG, 290), /* the private SSL-certificate as a "blob" */ CURLOPT(CURLOPT_SSLCERT_BLOB, CURLOPTTYPE_BLOB, 291), @@ -2235,6 +2235,9 @@ typedef enum { /* */ #define CURLOPT_FTP_RESPONSE_TIMEOUT CURLOPT_SERVER_RESPONSE_TIMEOUT +/* Added in 8.2.0 */ +#define CURLOPT_MAIL_RCPT_ALLLOWFAILS CURLOPT_MAIL_RCPT_ALLOWFAILS + #else /* This is set if CURL_NO_OLDIES is defined at compile-time */ #undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */ diff --git a/lib/easyoptions.c b/lib/easyoptions.c index a9c1efd006..1e588c3766 100644 --- a/lib/easyoptions.c +++ b/lib/easyoptions.c @@ -164,7 +164,9 @@ struct curl_easyoption Curl_easyopts[] = { {"MAIL_AUTH", CURLOPT_MAIL_AUTH, CURLOT_STRING, 0}, {"MAIL_FROM", CURLOPT_MAIL_FROM, CURLOT_STRING, 0}, {"MAIL_RCPT", CURLOPT_MAIL_RCPT, CURLOT_SLIST, 0}, - {"MAIL_RCPT_ALLLOWFAILS", CURLOPT_MAIL_RCPT_ALLLOWFAILS, CURLOT_LONG, 0}, + {"MAIL_RCPT_ALLLOWFAILS", CURLOPT_MAIL_RCPT_ALLOWFAILS, + CURLOT_LONG, CURLOT_FLAG_ALIAS}, + {"MAIL_RCPT_ALLOWFAILS", CURLOPT_MAIL_RCPT_ALLOWFAILS, CURLOT_LONG, 0}, {"MAXAGE_CONN", CURLOPT_MAXAGE_CONN, CURLOT_LONG, 0}, {"MAXCONNECTS", CURLOPT_MAXCONNECTS, CURLOT_LONG, 0}, {"MAXFILESIZE", CURLOPT_MAXFILESIZE, CURLOT_LONG, 0}, diff --git a/lib/setopt.c b/lib/setopt.c index 0c3b9634d1..afe7f7416a 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2711,7 +2711,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) /* Set the list of mail recipients */ data->set.mail_rcpt = va_arg(param, struct curl_slist *); break; - case CURLOPT_MAIL_RCPT_ALLLOWFAILS: + case CURLOPT_MAIL_RCPT_ALLOWFAILS: /* allow RCPT TO command to fail for some recipients */ data->set.mail_rcpt_allowfails = (0 != va_arg(param, long)) ? TRUE : FALSE; break; diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 0961a0e4b8..d1254ce49d 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -1589,7 +1589,7 @@ d c 00288 d CURLOPT_SASL_AUTHZID... d c 10289 - d CURLOPT_MAIL_RCPT_ALLLOWFAILS... + d CURLOPT_MAIL_RCPT_ALLOWFAILS... d c 00290 d CURLOPT_SSLCERT_BLOB... d c 40291 diff --git a/src/tool_operate.c b/src/tool_operate.c index 16ad0665ee..ce84183022 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -2044,8 +2044,8 @@ static CURLcode single_transfer(struct GlobalConfig *global, my_setopt_slist(curl, CURLOPT_MAIL_RCPT, config->mail_rcpt); /* curl 7.69.x */ - my_setopt(curl, CURLOPT_MAIL_RCPT_ALLLOWFAILS, - config->mail_rcpt_allowfails ? 1L : 0L); + my_setopt(curl, CURLOPT_MAIL_RCPT_ALLOWFAILS, + config->mail_rcpt_allowfails ? 1L : 0L); /* curl 7.20.x */ if(config->ftp_pret)