summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Lemon <source@isc.org>2000-11-29 13:38:36 +0000
committerTed Lemon <source@isc.org>2000-11-29 13:38:36 +0000
commit8df547bf26ba372c34913b8a94ab8827469b6480 (patch)
tree2572f1afcf3efd157e685ec0c5f8bfb327fb0df5
parenta1249be66f7638adc71bb5f2e528ea1bd73b731d (diff)
downloadisc-dhcp-8df547bf26ba372c34913b8a94ab8827469b6480.tar.gz
Fix an uninitialized variable reference
-rw-r--r--common/options.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/options.c b/common/options.c
index cfbc5e82..d21e17d9 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;