[master] Restores ability of server to return dhcp6.vendor-opts to client

    Merges in rt46427.

1 files changed, 4 insertions, 2 deletions

diff --git a/common/options.c b/common/options.c
index ae5b2844..5044d4a1 100644
--- a/common/options.c
+++ b/common/options.c
@@ -1126,11 +1126,13 @@ store_options6(char *buf, int buflen,
 		}
 
 		/*
-		 * See if this is the VSIO option.
+		 * If this is the VSIO option flag it so we'll know to
+		 * check the vsio space later on.  However we still need
+		 * to check for the existence of any defined via
+		 * dhcp6.vendor-opts. Those are stored as simple values.
 		 */
 		if (code == vsio_option_code) {
 			vsio_wanted = 1;
-			continue;
 		}
 
 		/*