From: Shawn Routhier <sar@isc.org>
Date: Mon, 20 Jun 2016 14:48:42 +0000 (-0700)
Subject: [master] Fix a cut and paste error replacing concat with pick-first-value
X-Git-Tag: v4_3_5b1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a7db2cdd7816ddd573fdc8cf2144ce5b85f5f9;p=thirdparty%2Fdhcp.git

[master] Fix a cut and paste error replacing concat with pick-first-value
---

diff --git a/RELNOTES b/RELNOTES
index c7eb246a9..9077f18ad 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -82,6 +82,11 @@ by Eric Young (eay@cryptsoft.com).
   reporting this issue and supplying its patch.
   [ISC-Bugs #42666]
 
+- Correct how the pick-first-value expression is written to a lease
+  file.  Previously it was written as a concat expression due to
+  a cut and paste error.
+  [ISC-Bugs #42253]
+
 			Changes since 4.3.4b1
 
 - None
diff --git a/common/tree.c b/common/tree.c
index 5698be589..e364b2ac4 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -3645,7 +3645,7 @@ int write_expression (file, expr, col, indent, firstp)
 	      case expr_pick_first_value:
 		e = expr;
 		col = token_print_indent (file, col, indent, "", "",
-					  "concat");
+					  "pick-first-value");
 		col = token_print_indent (file, col, indent, " ", "",
 					  "(");
 		scol = col;