From 0105f37f4b62c46ae3723f697a4085525628a417 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 21 Nov 2014 18:15:41 +0000 Subject: MPE support, begone. ok tedu --- lib/libcrypto/bio/bss_conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/libcrypto/bio/bss_conn.c b/lib/libcrypto/bio/bss_conn.c index 5120dabcb57..e55fc2d163d 100644 --- a/lib/libcrypto/bio/bss_conn.c +++ b/lib/libcrypto/bio/bss_conn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_conn.c,v 1.30 2014/07/13 16:03:09 beck Exp $ */ +/* $OpenBSD: bss_conn.c,v 1.31 2014/11/21 18:15:40 deraadt Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -218,7 +218,7 @@ conn_state(BIO *b, BIO_CONNECT *c) } c->state = BIO_CONN_S_CONNECT; -#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE) +#if defined(SO_KEEPALIVE) i = 1; i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE,(char *)&i, sizeof(i)); if (i < 0) { -- cgit v1.2.3