From: Shawn Routhier <sar@isc.org>
Date: Thu, 25 Aug 2016 17:41:35 +0000 (-0700)
Subject: [master] Clean up some memory references
X-Git-Tag: v4_4_0b1_f1~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51ce599530dc41bec084561ef63e591fc83ec922;p=thirdparty%2Fdhcp.git

[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
---

diff --git a/RELNOTES b/RELNOTES
index d85849866..07bb8d1ce 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -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
diff --git a/server/confpars.c b/server/confpars.c
index 489ec7c49..126b3d6b4 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -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;