From: Roy Marples <roy@marples.name>
Date: Sun, 1 Dec 2013 17:45:42 +0000 (+0000)
Subject: Remove dup type check
X-Git-Tag: v6.2.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78e9e2b716ef1e62b9860ee041a5abe801a68e91;p=thirdparty%2Fdhcpcd.git

Remove dup type check
---

diff --git a/if-options.c b/if-options.c
index eb68fa50..f0975737 100644
--- a/if-options.c
+++ b/if-options.c
@@ -1372,10 +1372,7 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
 			free_dhcp_opt_embenc(ndop);
 		ndop->option = i; /* could have been 0 */
 		ndop->type = t;
-		if (t & (STRING | BINHEX))
-			ndop->len = l;
-		else
-			ndop->len = 0;
+		ndop->len = l;
 		ndop->v.dvar = np;
 		/* Save the define for embed and encap options */
 		if (opt == O_DEFINE || opt == O_DEFINE6)