diff options
author | Andreas Metzler <ametzler@bebt.de> | 2013-11-09 17:35:48 +0100 |
---|---|---|
committer | Andreas Metzler <ametzler@bebt.de> | 2013-11-09 17:35:48 +0100 |
commit | 67d488b288c497ede631d9fc4f753e46d0e53d58 (patch) | |
tree | d4591725bf12ef9df11f3dc443da05553a7909f7 /debian/patches/77_close-the-server-side-of-TLS.diff | |
parent | 1e0203f9d3e0e790baceaf9711ba12c261c638ba (diff) | |
download | exim4-67d488b288c497ede631d9fc4f753e46d0e53d58.tar.gz |
Pull multiple fixes from GITexperimental/4.82-2
Pull two post-release fixes from upstream git master:
+ 75_unbind-ldap-connection.diff - Only unbind ldap connection if bind
succeeded.
+ 77_close-the-server-side-of-TLS.diff - Correctly close the server side
of TLS when forking for delivery.
Pull 76_fix_ldap_option_setting.diff from Todd Lyons testing tree. See
<http://mid.gmane.org/20131029200309.GA277075%40zedat.fu-berlin.de>.
Diffstat (limited to 'debian/patches/77_close-the-server-side-of-TLS.diff')
-rw-r--r-- | debian/patches/77_close-the-server-side-of-TLS.diff | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/77_close-the-server-side-of-TLS.diff b/debian/patches/77_close-the-server-side-of-TLS.diff new file mode 100644 index 0000000..ca7c9bb --- /dev/null +++ b/debian/patches/77_close-the-server-side-of-TLS.diff @@ -0,0 +1,40 @@ +From a400eccf287c55558ae7197c831828cf10b0a35c Mon Sep 17 00:00:00 2001 +From: Tony Finch <dot@dotat.at> +Date: Tue, 5 Nov 2013 12:18:02 +0000 +Subject: [PATCH 2/8] Correctly close the server side of TLS when forking for + delivery. + +--- + src/daemon.c | 2 +- + src/exim.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/daemon.c b/src/daemon.c +index 3467f14..8e61dcf 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -639,7 +639,7 @@ if (pid == 0) + the data structures if necessary. */ + + #ifdef SUPPORT_TLS +- tls_close(FALSE, FALSE); ++ tls_close(TRUE, FALSE); + #endif + + /* Reset SIGHUP and SIGCHLD in the child in both cases. */ +diff --git a/src/exim.c b/src/exim.c +index a715c0b..856e655 100644 +--- a/src/exim.c ++++ b/src/exim.c +@@ -526,7 +526,7 @@ close_unwanted(void) + if (smtp_input) + { + #ifdef SUPPORT_TLS +- tls_close(FALSE, FALSE); /* Shut down the TLS library */ ++ tls_close(TRUE, FALSE); /* Shut down the TLS library */ + #endif + (void)close(fileno(smtp_in)); + (void)close(fileno(smtp_out)); +-- +1.7.10.4 + |