From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 12 Jul 2014 14:08:22 +0000 (+0200)
Subject: Remove bad cherry-pick
X-Git-Tag: Release-7.0.5~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=74e50a8879603a6525b9d3bf7232f38ed7576df8;p=bacula%2Fbacula

Remove bad cherry-pick
---

diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c
index 3e7e233b32..d947ba0748 100644
--- a/bacula/src/lib/bsock.c
+++ b/bacula/src/lib/bsock.c
@@ -932,15 +932,6 @@ int BSOCK::wait_data_intr(int sec, int usec)
       return -1;                /* error return */
    default:
       b_errno = 0;
-<<<<<<< HEAD
-=======
-#ifdef HAVE_TLS
-      if (this->tls && !tls_bsock_probe(this)) {
-         /* maybe a session key negotiation waked up the socket */
-         return 0;
-      }
-#endif
->>>>>>> 625e1f1... Fix compilation of bsock.c when TLS is not available
       break;
    }
    return 1;