char: don't silently skip tn3270 protocol init when TLS is enabled

Even if common tn3270 implementations do not support TLS, it is trivial to
have them proxied over a proxy like stunnel which adds TLS at the sockets
layer. We should thus not silently skip tn3270 protocol initialization
when TLS is enabled.

Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-12-21 10:52:37 +00:00 committed by Daniel P. Berrangé
parent 59667bb167
commit 63bab2b696

View File

@ -663,8 +663,7 @@ static void tcp_chr_tls_handshake(QIOTask *task,
if (qio_task_propagate_error(task, NULL)) { if (qio_task_propagate_error(task, NULL)) {
tcp_chr_disconnect(chr); tcp_chr_disconnect(chr);
} else { } else {
/* tn3270 does not support TLS yet */ if (s->do_telnetopt) {
if (s->do_telnetopt && !s->is_tn3270) {
tcp_chr_telnet_init(chr); tcp_chr_telnet_init(chr);
} else { } else {
tcp_chr_connect(chr); tcp_chr_connect(chr);