From 742c764ecc0f891a8d36d3c11815aab4f8ac8f80 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Mon, 13 Oct 2014 02:49:53 +0000
Subject: The return value on success of fcntl(F_SETFL) is not actually
 specified, only that it returns -1 on failure.

pointed out by guenther@
---
 src/lib/libcrypto/bio/b_sock.c         | 6 +++---
 src/lib/libssl/src/crypto/bio/b_sock.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 81c48a6e5c..34e5d9830e 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.57 2014/10/13 02:39:09 bcook Exp $ */
+/* $OpenBSD: b_sock.c,v 1.58 2014/10/13 02:49:53 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -462,8 +462,8 @@ BIO_socket_nbio(int s, int mode)
 {
 	int flags = fcntl(s, F_GETFD);
 	if (mode && !(flags & O_NONBLOCK))
-		return (fcntl(s, F_SETFL, flags | O_NONBLOCK) == 0);
+		return (fcntl(s, F_SETFL, flags | O_NONBLOCK) != -1);
 	else if (!mode && (flags & O_NONBLOCK))
-		return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) == 0);
+		return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1);
 	return (1);
 }
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index 81c48a6e5c..34e5d9830e 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.57 2014/10/13 02:39:09 bcook Exp $ */
+/* $OpenBSD: b_sock.c,v 1.58 2014/10/13 02:49:53 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -462,8 +462,8 @@ BIO_socket_nbio(int s, int mode)
 {
 	int flags = fcntl(s, F_GETFD);
 	if (mode && !(flags & O_NONBLOCK))
-		return (fcntl(s, F_SETFL, flags | O_NONBLOCK) == 0);
+		return (fcntl(s, F_SETFL, flags | O_NONBLOCK) != -1);
 	else if (!mode && (flags & O_NONBLOCK))
-		return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) == 0);
+		return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1);
 	return (1);
 }
-- 
cgit v1.2.3-55-g6feb