From b7cd7fa81980ded55692b8cea770fd0a698ed7ec Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 10 Apr 2012 16:24:30 +0200 Subject: [PATCH] Copy three missing clsrvconf members when "merging configurations". --- radsecproxy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; -- 2.1.4