summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hankins <dhankins@isc.org>2008-10-08 16:28:32 +0000
committerDavid Hankins <dhankins@isc.org>2008-10-08 16:28:32 +0000
commit342479faa70d1370fd5867e0eb9dd380fb4d9425 (patch)
tree16e48388cf0a3d807f10d3f3967bf2ff01f7360f
parente3c41f58fa1675e0a8abf0002a4f3add71f946e2 (diff)
downloadisc-dhcp-342479faa70d1370fd5867e0eb9dd380fb4d9425.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.c2
-rw-r--r--includes/config.h.in2
3 files changed, 4 insertions, 2 deletions
diff --git a/RELNOTES b/RELNOTES
index d4d61ea3..55883d4d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -181,6 +181,8 @@ suggested fixes to <dhcp-users@isc.org>.
- 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 4.0.0rc1
- None
diff --git a/common/parse.c b/common/parse.c
index ce83fc47..6f482eaf 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -1174,7 +1174,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. "
diff --git a/includes/config.h.in b/includes/config.h.in
index f958faf3..5936a8cc 100644
--- a/includes/config.h.in
+++ b/includes/config.h.in
@@ -88,7 +88,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* The size of a `struct iaddr *', as computed by sizeof. */
+/* The size of `struct iaddr *', as computed by sizeof. */
#undef SIZEOF_STRUCT_IADDR_P
/* Define to 1 if you have the ANSI C header files. */