]> git.sur5r.net Git - bacula/bacula/commitdiff
Remove bad cherry-pick
authorKern Sibbald <kern@sibbald.com>
Sat, 12 Jul 2014 14:07:17 +0000 (16:07 +0200)
committerKern Sibbald <kern@sibbald.com>
Sat, 12 Jul 2014 14:07:17 +0000 (16:07 +0200)
bacula/src/lib/bsock.c

index eb9041cee14173e1c7ff944a1240fae3eabe1adf..3e7e233b32ebf47bcdedb156de2110aaa02cdfca 100644 (file)
@@ -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;
       }
    }