diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 10:13:53 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-11-21 10:16:25 +0100 |
| commit | 56fe41c68de3c0b85f7eee6b56cd261e9905045a (patch) | |
| tree | 33b2d0a4165815eda460631b2714e47e21d011bd /debian/patches/close_socket_before_scripts.patch | |
| parent | 93b77cacdbb7e6f310c4e20f85c3a24ed5ba18ba (diff) | |
Refresh patches for 2.4
Diffstat (limited to 'debian/patches/close_socket_before_scripts.patch')
| -rw-r--r-- | debian/patches/close_socket_before_scripts.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/close_socket_before_scripts.patch b/debian/patches/close_socket_before_scripts.patch index 3e53a68..0b848a0 100644 --- a/debian/patches/close_socket_before_scripts.patch +++ b/debian/patches/close_socket_before_scripts.patch @@ -6,10 +6,10 @@ Bug-Debian: http://bugs.debian.org/367716 Index: openvpn/src/openvpn/socket.c =================================================================== ---- openvpn.orig/src/openvpn/socket.c 2016-05-10 17:41:14.575583789 +0200 -+++ openvpn/src/openvpn/socket.c 2016-05-10 17:41:14.571583824 +0200 -@@ -1502,6 +1502,10 @@ - resolve_bind_local (sock); +--- openvpn.orig/src/openvpn/socket.c 2016-11-21 09:58:03.562096178 +0100 ++++ openvpn/src/openvpn/socket.c 2016-11-21 10:01:20.143091482 +0100 +@@ -1625,6 +1625,10 @@ + } resolve_remote (sock, 1, NULL, NULL); } + @@ -18,8 +18,8 @@ Index: openvpn/src/openvpn/socket.c + set_cloexec (sock->sd); } - /* finalize socket initialization */ -@@ -1732,10 +1736,6 @@ + static +@@ -1677,10 +1681,6 @@ /* set socket to non-blocking mode */ set_nonblock (sock->sd); @@ -27,6 +27,6 @@ Index: openvpn/src/openvpn/socket.c - scripts don't have access to it */ - set_cloexec (sock->sd); - - #ifdef ENABLE_SOCKS if (socket_defined (sock->ctrl_sd)) set_cloexec (sock->ctrl_sd); + |