summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-09-24 14:54:55 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-09-24 14:54:55 +0000
commitcdd1293ebdea36937adf9265f828679019bfc131 (patch)
tree1f068e4ddc46e5de50862c55faf3cd56fb8882fc
parent3138cede31d22a863de7bf2fddfa8cf19f106d2a (diff)
No point in checking for a NULL ifi after we've used it. Plus ifi is
set once in main() and used everywhere without further checks. From Matthew R. Dempsky via tech@
-rw-r--r--sbin/dhclient/dhclient.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index eaffe961b6c..6147a161d1d 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.88 2006/08/31 10:12:18 deraadt Exp $ */
+/* $OpenBSD: dhclient.c,v 1.89 2006/09/24 14:54:54 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -184,8 +184,6 @@ routehandler(struct protocol *p)
break;
if (findproto((char *)(ifam + 1), ifam->ifam_addrs) != AF_INET)
break;
- if (ifi == NULL)
- goto die;
sa = get_ifa((char *)(ifam + 1), ifam->ifam_addrs);
if (sa == NULL)
goto die;