From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 30 Dec 2014 20:39:14 +0000 (-0500)
Subject: Duplicate the pair's filename and line number too in cf_pair_dup
X-Git-Tag: release_3_0_7~400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4badac1a1b4189b3af9e8a70bcc89a88e8891cc;p=thirdparty%2Ffreeradius-server.git

Duplicate the pair's filename and line number too in cf_pair_dup
---

diff --git a/src/main/conffile.c b/src/main/conffile.c
index 071e0683da5..707098fdb78 100644
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -342,11 +342,16 @@ CONF_PAIR *cf_pair_alloc(CONF_SECTION *parent, char const *attr, char const *val
  */
 CONF_PAIR *cf_pair_dup(CONF_SECTION *parent, CONF_PAIR *cp)
 {
+	CONF_PAIR *new;
+
 	rad_assert(parent);
 	rad_assert(cp);
 
-	return cf_pair_alloc(parent, cf_pair_attr(cp), cf_pair_value(cp),
-			     cf_pair_operator(cp), cf_pair_value_type(cp));
+	new = cf_pair_alloc(parent, cf_pair_attr(cp), cf_pair_value(cp), cf_pair_operator(cp), cf_pair_value_type(cp));
+	new->item.lineno = cp->item.lineno;
+	new->item.filename = talloc_strdup(cp, cp->item.filename);
+
+	return new;
 }
 
 /** Add a configuration pair to a section