7bb7b2c2a4
Daniel Stenberg
2026-06-07
Subject
tool: warn when --ssl and --ftp-ssl-control override each other
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
docs/cmdline-opts/ftp-ssl-control.md+2 -0
| @@ -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. |
docs/cmdline-opts/ssl.md+2 -0
| @@ -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. | |
src/tool_getparam.c+8 -0
| @@ -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; | |