From: Linus Nordberg <linus@nordu.net>
Date: Tue, 10 Apr 2012 14:24:30 +0000 (+0200)
Subject: Copy three missing clsrvconf members when "merging configurations".
X-Git-Tag: radsecproxy-1.6-rc0~31
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=b7cd7fa81980ded55692b8cea770fd0a698ed7ec

Copy three missing clsrvconf members when "merging configurations".
---

diff --git a/radsecproxy.c b/radsecproxy.c
index 2facb2b..845c208 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -2646,7 +2646,10 @@ int mergesrvconf(struct clsrvconf *dst, struct clsrvconf *src) {
 	!mergeconfstring(&dst->matchcertattr, &src->matchcertattr) ||
 	!mergeconfstring(&dst->confrewritein, &src->confrewritein) ||
 	!mergeconfstring(&dst->confrewriteout, &src->confrewriteout) ||
-	!mergeconfstring(&dst->dynamiclookupcommand, &src->dynamiclookupcommand))
+	!mergeconfstring(&dst->confrewriteusername, &src->confrewriteusername) ||
+	!mergeconfstring(&dst->dynamiclookupcommand, &src->dynamiclookupcommand) ||
+	!mergeconfstring(&dst->fticks_viscountry, &src->fticks_viscountry) ||
+	!mergeconfstring(&dst->fticks_visinst, &src->fticks_visinst))
 	return 0;
     if (src->pdef)
 	dst->pdef = src->pdef;