From 6585927e66d9ab172754d95c4296dd4309a40512 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 28 Jun 2019 13:35:02 +0000
Subject: When system calls indicate an error they return -1, not some
 arbitrary value < 0.  errno is only updated in this case.  Change all (most?)
 callers of syscalls to follow this better, and let's see if this strictness
 helps us in the future.

---
 src/lib/libc/net/rcmdsh.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/libc/net/rcmdsh.c')

diff --git a/src/lib/libc/net/rcmdsh.c b/src/lib/libc/net/rcmdsh.c
index b9cbd6d5d1..66caac3f3d 100644
--- a/src/lib/libc/net/rcmdsh.c
+++ b/src/lib/libc/net/rcmdsh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcmdsh.c,v 1.19 2016/05/28 15:46:00 millert Exp $	*/ 
+/*	$OpenBSD: rcmdsh.c,v 1.20 2019/06/28 13:32:42 deraadt Exp $	*/ 
 
 /*
  * Copyright (c) 2001, MagniComp
@@ -89,13 +89,13 @@ rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser,
 	}
 
 	/* Get a socketpair we'll use for stdin and stdout. */
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) < 0) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) {
 		perror("rcmdsh: socketpair");
 		return(-1);
 	}
 
 	cpid = fork();
-	if (cpid < 0) {
+	if (cpid == -1) {
 		perror("rcmdsh: fork failed");
 		return(-1);
 	} else if (cpid == 0) {
@@ -103,13 +103,13 @@ rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser,
 		 * Child.  We use sp[1] to be stdin/stdout, and close sp[0].
 		 */
 		(void) close(sp[0]);
-		if (dup2(sp[1], 0) < 0 || dup2(0, 1) < 0) {
+		if (dup2(sp[1], 0) == -1 || dup2(0, 1) == -1) {
 			perror("rcmdsh: dup2 failed");
 			_exit(255);
 		}
 		/* Fork again to lose parent. */
 		cpid = fork();
-		if (cpid < 0) {
+		if (cpid == -1) {
 			perror("rcmdsh: fork to lose parent failed");
 			_exit(255);
 		}
-- 
cgit v1.2.3-55-g6feb