summaryrefslogtreecommitdiff
path: root/chardev
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2017-12-21 10:52:37 +0000
committerDaniel P. Berrangé <berrange@redhat.com>2018-03-13 16:32:15 +0000
commit63bab2b69688dee0ddadff7449143830e59567cd (patch)
tree69340a351e0ecd0cba88f7b0ec463719a505d243 /chardev
parent59667bb167f773965ce6547352f312eff0d4d523 (diff)
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>
Diffstat (limited to 'chardev')
-rw-r--r--chardev/char-socket.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index a220803c01..1a371b91ac 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -663,8 +663,7 @@ static void tcp_chr_tls_handshake(QIOTask *task,
if (qio_task_propagate_error(task, NULL)) {
tcp_chr_disconnect(chr);
} else {
- /* tn3270 does not support TLS yet */
- if (s->do_telnetopt && !s->is_tn3270) {
+ if (s->do_telnetopt) {
tcp_chr_telnet_init(chr);
} else {
tcp_chr_connect(chr);