summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hankins <dhankins@isc.org>2008-10-08 16:30:54 +0000
committerDavid Hankins <dhankins@isc.org>2008-10-08 16:30:54 +0000
commit1988452fd6c242bb637a232b2259df9eaddb9989 (patch)
treed5c9f2b3e47da8a8d49ea3d0e4229e03e7e5dc5a
parentaa802064f71c5ec6ca9abe08b71a585f8e77a0c0 (diff)
downloadisc-dhcp-1988452fd6c242bb637a232b2259df9eaddb9989.tar.gz
- A bug cleaning up unknown-xxx temporary option definitions was fixed.
[ISC-Bugs #18735]
-rw-r--r--RELNOTES2
-rw-r--r--common/parse.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/RELNOTES b/RELNOTES
index c4c93cd2..c4fed98d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -74,6 +74,8 @@ the README file.
- Failover BNDUPD messages are now discarded if they conflict with an
update that has been trasnmitted, but not acknowledged.
+- A bug cleaning up unknown-xxx temporary option definitions was fixed.
+
Changes since 3.1.1rc2
- None.
diff --git a/common/parse.c b/common/parse.c
index 6ebf6a0f..b53abde9 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: parse.c,v 1.117.8.7 2008/01/22 19:02:50 dhankins Exp $ Copyright (c) 2004-2008 Internet Systems Consortium. All rights reserved.\n";
+"$Id: parse.c,v 1.117.8.8 2008/10/08 16:30:54 dhankins Exp $ Copyright (c) 2004-2008 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -1041,7 +1041,7 @@ parse_option_name (cfile, allocate, known, opt)
option = new_option(val, MDL);
option->universe = universe;
option->code = code;
- option->format = "X";
+ option->format = default_option_format;
option_reference(opt, option, MDL);
} else
log_info("option %s has been redefined as option %s. "