From 249f750a6273a690b2e013bc17fbeba81223d0eb Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 27 Jan 2013 16:59:31 +0100 Subject: sync to git --- openvpn/src/openvpn/error.c | 1 + openvpn/src/openvpn/socket.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/openvpn/src/openvpn/error.c b/openvpn/src/openvpn/error.c index 98611a1b..d9450a6c 100644 --- a/openvpn/src/openvpn/error.c +++ b/openvpn/src/openvpn/error.c @@ -404,6 +404,7 @@ void assert_failed (const char *filename, int line) { #ifdef GOOGLE_BREAKPAD + msg (M_NONFATAL, "Assertion failed at %s:%d", filename, line); breakpad_dodump(); #endif msg (M_FATAL, "Assertion failed at %s:%d", filename, line); diff --git a/openvpn/src/openvpn/socket.c b/openvpn/src/openvpn/socket.c index 31ff6d21..83af046f 100644 --- a/openvpn/src/openvpn/socket.c +++ b/openvpn/src/openvpn/socket.c @@ -686,7 +686,6 @@ create_socket (struct link_socket *sock) { ASSERT (0); } - /* set socket buffers based on --sndbuf and --rcvbuf options */ socket_set_buffers (sock->sd, &sock->socket_buffer_sizes); @@ -939,7 +938,6 @@ openvpn_connect (socket_descriptor_t sd, protect_fd_nonlocal(sd, remote); status = connect (sd, remote, af_addr_size(remote->sa_family)); - if (status) status = openvpn_errno (); if ( -- cgit v1.2.3