From: Roy Marples <roy@marples.name>
Date: Fri, 8 Nov 2013 09:56:54 +0000 (+0000)
Subject: Preserve vendor encapsulated options
X-Git-Tag: v6.2.0~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b357d09f87ccdf0480d1affe943506295b993899;p=thirdparty%2Fdhcpcd.git

Preserve vendor encapsulated options
---

diff --git a/if-options.c b/if-options.c
index e7841c4b..b708108e 100644
--- a/if-options.c
+++ b/if-options.c
@@ -594,7 +594,7 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
 	case 'v':
 		p = strchr(arg, ',');
 		if (!p || !p[1]) {
-			syslog(LOG_ERR, "invalid vendor format");
+			syslog(LOG_ERR, "invalid vendor format: %s", arg);
 			return -1;
 		}
 
@@ -618,14 +618,15 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
 			ifo->vendor[0] = 0;
 		}
 
-		*p = '\0';
+		/* No need to strip the comma */
 		i = atoint(arg);
-		arg = p + 1;
 		if (i < 1 || i > 254) {
 			syslog(LOG_ERR, "vendor option should be between"
 			    " 1 and 254 inclusive");
 			return -1;
 		}
+
+		arg = p + 1;
 		s = VENDOR_MAX_LEN - ifo->vendor[0] - 2;
 		if (inet_aton(arg, &addr) == 1) {
 			if (s < 6) {