Module Name:    src
Committed By:   christos
Date:           Sun Apr 24 18:16:05 UTC 2016

Modified Files:
        src/external/bsd/dhcpcd/dist: dhcp-common.c

Log Message:
CID 1358676: Forward NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/dhcp-common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/dhcpcd/dist/dhcp-common.c
diff -u src/external/bsd/dhcpcd/dist/dhcp-common.c:1.14 src/external/bsd/dhcpcd/dist/dhcp-common.c:1.15
--- src/external/bsd/dhcpcd/dist/dhcp-common.c:1.14	Wed Apr 20 04:53:01 2016
+++ src/external/bsd/dhcpcd/dist/dhcp-common.c	Sun Apr 24 14:16:05 2016
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp-common.c,v 1.14 2016/04/20 08:53:01 roy Exp $");
+ __RCSID("$NetBSD: dhcp-common.c,v 1.15 2016/04/24 18:16:05 christos Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
@@ -210,7 +210,7 @@ make_option_mask(const struct dhcp_opt *
 			continue;
 		match = 0;
 		for (i = 0, opt = odopts; i < odopts_len; i++, opt++) {
-			if (opt->var == NULL && opt->option == 0)
+			if (opt->var == NULL)
 				continue; /* buggy dhcpcd-definitions.conf */
 			if (strcmp(opt->var, token) == 0)
 				match = 1;

Reply via email to