From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 4 Jan 2012 13:15:38 +0000 (+0100)
Subject: Try to fix openssl problem with signal
X-Git-Tag: Release-7.0.0~369
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4aa38a8230a9d8ba9bc42097a07d1f921ddcb803;p=bacula%2Fbacula

Try to fix openssl problem with signal
---

diff --git a/bacula/src/lib/tls.c b/bacula/src/lib/tls.c
index 3c5d7d7157..fc447c2eb9 100644
--- a/bacula/src/lib/tls.c
+++ b/bacula/src/lib/tls.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2005-2011 Free Software Foundation Europe e.V.
+   Copyright (C) 2005-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -472,6 +472,7 @@ static inline bool openssl_bsock_session_start(BSOCK *bsock, bool server)
    /* start timer */
    bsock->timer_start = watchdog_time;
    bsock->clear_timed_out();
+   bsock->set_killable(false);
 
    for (;;) { 
       if (server) {
@@ -525,6 +526,7 @@ cleanup:
    bsock->restore_blocking(flags);
    /* Clear timer */
    bsock->timer_start = 0;
+   bsock->set_killable(true);
 
    return stat;
 }
@@ -618,6 +620,7 @@ static inline int openssl_bsock_readwrite(BSOCK *bsock, char *ptr, int nbytes, b
    /* start timer */
    bsock->timer_start = watchdog_time;
    bsock->clear_timed_out();
+   bsock->set_killable(false);
 
    nleft = nbytes;
 
@@ -694,6 +697,7 @@ cleanup:
 
    /* Clear timer */
    bsock->timer_start = 0;
+   bsock->set_killable(true);
    return nbytes - nleft;
 }