Commit 51ce5995 authored by Shawn Routhier's avatar Shawn Routhier
Browse files

[master] Clean up some memory references

Squashed commit of the following:

commit c3e88212ff666701b5aca3cbc96b557fa37aa682
Author: Shawn Routhier <sar@isc.org>
Date:   Wed Aug 24 11:33:31 2016 -0700

    [rt42984] Clean up some memory references
parent 60bba434
......@@ -884,6 +884,9 @@ by Eric Young (eay@cryptsoft.com).
interfaces will accept and forward only BOOTP requests.
[ISC-Bugs #41547]
- Clean up some memory references in the vendor-class construct.
[ISC-Bugs #42984]
Changes since 4.2.0 (new features)
- If a client renews before 'dhcp-cache-threshold' percent of its lease
......
......@@ -2264,7 +2264,9 @@ int parse_class_declaration (cp, cfile, group, type)
data.data = &data.buffer -> data [0];
data.terminated = 1;
tname = type ? "implicit-vendor-class" : "implicit-user-class";
tname = (type == CLASS_TYPE_VENDOR) ?
"implicit-vendor-class" : "implicit-user-class";
} else if (type == CLASS_TYPE_CLASS) {
tname = val;
} else {
......@@ -2275,7 +2277,7 @@ int parse_class_declaration (cp, cfile, group, type)
name = dmalloc (strlen (tname) + 1, MDL);
if (!name)
log_fatal ("No memory for class name %s.", tname);
strcpy (name, val);
strcpy (name, tname);
} else
name = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment