From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Sat, 4 Aug 2012 19:08:44 +0000 (+0200)
Subject: dhclient - Change return code test logic.
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/5d9fea5f7243e8165ff7ac7b5951edef59d71f9e

dhclient - Change return code test logic.

Taken from: OpenBSD
---

diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 7968d24208..8f8e9ae609 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: src/sbin/dhclient/dispatch.c,v 1.49 2010/10/23 14:26:57 phessler Exp $	*/
+/*	$OpenBSD: src/sbin/dhclient/dispatch.c,v 1.50 2012/06/22 01:01:59 krw Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -269,7 +269,7 @@ interface_status(char *ifname)
 	/* get interface flags */
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
+	if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) {
 		error("ioctl(SIOCGIFFLAGS) on %s: %m", ifname);
 	}
 
@@ -285,7 +285,7 @@ interface_status(char *ifname)
 		goto active;
 	memset(&ifmr, 0, sizeof(ifmr));
 	strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
-	if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+	if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) == -1) {
 		/*
 		 * EINVAL or ENOTTY simply means that the interface
 		 * does not support the SIOCGIFMEDIA ioctl. We regard it alive.