Merge pull request #2165 from drwetter/ftp_starttls_auth_only_3.0

Relax STARTTLS FTP requirement (3.0)
This commit is contained in:
Dirk Wetter 2022-04-28 07:30:51 +02:00 committed by GitHub
commit 793eaa3f84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10297,7 +10297,7 @@ starttls_full_read(){
starttls_ftp_dialog() {
debugme echo "=== starting ftp STARTTLS dialog ==="
local reAUTHTLS='^ AUTH TLS'
local reAUTHTLS='^ AUTH'
starttls_full_read '^220-' '^220 ' && debugme echo "received server greeting" &&
starttls_just_send 'FEAT' && debugme echo "sent FEAT" &&
starttls_full_read '^(211-| )' '^211 ' "${reAUTHTLS}" && debugme echo "received server features and checked STARTTLS availability" &&