diff options
| -rw-r--r-- | sbin/dhclient/dhclient.c | 10 | ||||
| -rw-r--r-- | sbin/dhclient/kroute.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index c30fe269fe5..fd16da36661 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.638 2019/06/30 16:46:40 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.639 2019/06/30 19:19:08 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -248,7 +248,7 @@ interface_state(struct interface_info *ifi) oldlinkup = LINK_STATE_IS_UP(ifi->link_state); - if (getifaddrs(&ifap) != 0) + if (getifaddrs(&ifap) == -1) fatal("getifaddrs"); ifa = get_link_ifa(ifi->name, ifap); @@ -289,7 +289,7 @@ get_hw_address(struct interface_info *ifi) struct ifaddrs *ifap, *ifa; struct sockaddr_dl *sdl; - if (getifaddrs(&ifap) != 0) + if (getifaddrs(&ifap) == -1) fatal("getifaddrs"); ifa = get_link_ifa(ifi->name, ifap); @@ -2478,7 +2478,7 @@ take_charge(struct interface_info *ifi, int routefd) fatal("poll(routefd)"); } if ((fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) != 0) - fatal("routefd: ERR|HUP|NVAL"); + fatalx("routefd: ERR|HUP|NVAL"); if (nfds == 0 || (fds[0].revents & POLLIN) == 0) continue; routefd_handler(ifi, routefd); @@ -2735,7 +2735,7 @@ propose_release(struct interface_info *ifi) fatal("poll(routefd)"); } if ((fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) != 0) - fatal("routefd: ERR|HUP|NVAL"); + fatalx("routefd: ERR|HUP|NVAL"); if (nfds == 0 || (fds[0].revents & POLLIN) == 0) continue; routefd_handler(ifi, routefd); diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index d543f5c7aeb..46551a91b6a 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.163 2019/05/17 20:42:44 krw Exp $ */ +/* $OpenBSD: kroute.c,v 1.164 2019/06/30 19:19:08 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback <krw@openbsd.org> @@ -85,7 +85,7 @@ delete_addresses(char *name, int ioctlfd, struct in_addr newaddr, struct ifaddrs *ifap, *ifa; int found; - if (getifaddrs(&ifap) != 0) + if (getifaddrs(&ifap) == -1) fatal("getifaddrs"); found = 0; |