From: Kern Sibbald Date: Sat, 12 Jul 2014 14:07:17 +0000 (+0200) Subject: Remove bad cherry-pick X-Git-Tag: Release-7.0.5~25 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8277fe6e8f496f827a03e0a6913a6b98f1191790;p=bacula%2Fbacula Remove bad cherry-pick --- diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c index eb9041cee1..3e7e233b32 100644 --- a/bacula/src/lib/bsock.c +++ b/bacula/src/lib/bsock.c @@ -903,11 +903,6 @@ int BSOCK::wait_data(int sec, int usec) return -1; /* error return */ default: b_errno = 0; -#ifdef HAVE_TLS - if (this->tls && !tls_bsock_probe(this)) { - continue; /* false alarm, maybe a session key negotiation in progress on the socket */ - } -#endif return 1; } }