romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-14 07:55:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool: warn when --ssl and --ftp-ssl-control override each other

Browse source 
and mention this properly in the docs.

Closes #21887
This commit is contained in:
Daniel Stenberg 2026-06-07 00:22:53 +02:00
parent c4c12843df
commit 7bb7b2c2a4
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/cmdline-opts/ftp-ssl-control.md
View file

@ -18,3 +18,5 @@ Example:
Require SSL/TLS for the FTP login, clear for transfer. Allows secure
authentication, but non-encrypted data transfers for efficiency. Fails the
transfer if the server does not support SSL/TLS.
If set, this option overrides --ssl.

2
docs/cmdline-opts/ssl.md
View file

@ -30,5 +30,7 @@ OpenLDAP backend and ignored by the generic ldap backend.
Please note that a server may close the connection if the negotiation fails.
If set, this option overrides --ftp-ssl-control.
This option was formerly known as --ftp-ssl (added in 7.11.0). That option
name can still be used but might be removed in a future version.

8
src/tool_getparam.c
View file

@ -1908,6 +1908,10 @@ static ParameterError opt_bool(struct OperationConfig *config,
if(config->ftp_ssl)
warnf("--%s is an insecure option, consider --ssl-reqd instead",
a->lname);
if(toggle && config->ftp_ssl_control) {
config->ftp_ssl_control = FALSE;
warnf("--%s overrides --ftp-ssl-control", a->lname);
}
break;
case C_FTP_SSL_CCC: /* --ftp-ssl-ccc */
config->ftp_ssl_ccc = toggle;
@ -1959,6 +1963,10 @@ static ParameterError opt_bool(struct OperationConfig *config,
break;
case C_FTP_SSL_CONTROL: /* --ftp-ssl-control */
config->ftp_ssl_control = toggle;
if(toggle && config->ftp_ssl) {
config->ftp_ssl = FALSE;
warnf("--%s overrides --ssl", a->lname);
}
break;
case C_RAW: /* --raw */
config->raw = toggle;