From: Ted Lemon <source@isc.org>
Date: Wed, 29 Nov 2000 13:38:36 +0000 (+0000)
Subject: Fix an uninitialized variable reference
X-Git-Tag: V3-BETA-2-PATCH-10~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8df547bf26ba372c34913b8a94ab8827469b6480;p=thirdparty%2Fdhcp.git

Fix an uninitialized variable reference
---

diff --git a/common/options.c b/common/options.c
index cfbc5e82a..d21e17d9e 100644
--- a/common/options.c
+++ b/common/options.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.70 2000/11/28 23:10:28 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.71 2000/11/29 13:38:36 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -234,7 +234,6 @@ int parse_encapsulated_suboptions (struct option_state *options,
 				   const char *uname)
 {
 	int i;
-	char *s;
 	struct universe *universe = find_option_universe (eopt, uname);
 
 	/* If we didn't find the universe, we can't do anything with it
@@ -251,7 +250,7 @@ int parse_encapsulated_suboptions (struct option_state *options,
 	i = (*universe -> decode) (options, buffer, len, universe);
 
 	/* If there is stuff before the suboptions, we have to keep it. */
-	if (s != eopt -> format)
+	if (eopt -> format [0] != 'E')
 		return 0;
 	/* Otherwise, return the status of the decode function. */
 	return i;