From 56ff50af6b15757779a5369fdfe6beb50a49f82d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 23 Jun 2007 10:13:00 +0000 Subject: [PATCH] More tweaks to crypto and bsock git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5068 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/bsock.c | 2 +- bacula/src/lib/openssl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c index 34f21a04bc..0e7f812738 100644 --- a/bacula/src/lib/bsock.c +++ b/bacula/src/lib/bsock.c @@ -798,7 +798,7 @@ void BSOCK::close() free_tls_connection(bsock->tls); bsock->tls = NULL; } - if (bsock->is_timed_out()) { + if (bsock->is_timed_out() || bsock->is_terminated()) { shutdown(bsock->m_fd, SHUT_RDWR); /* discard any pending I/O */ } socketClose(bsock->m_fd); /* normal close */ diff --git a/bacula/src/lib/openssl.c b/bacula/src/lib/openssl.c index 59aadf26f7..7f161d71d1 100644 --- a/bacula/src/lib/openssl.c +++ b/bacula/src/lib/openssl.c @@ -83,7 +83,7 @@ void openssl_post_errors(JCR *jcr, int code, const char *errstring) /* Acquire the human readable string */ ERR_error_string_n(sslerr, buf, sizeof(buf)); Dmsg3(100, "jcr=%p %s: ERR=%s\n", jcr, errstring, buf); - Jmsg2(jcr, M_ERROR, 0, "%s: ERR=%s\n", errstring, buf); + Qmsg2(jcr, M_ERROR, 0, "%s: ERR=%s\n", errstring, buf); } } -- 2.39.5