diff options
| author | Linus Nordberg <linus@nordu.net> | 2012-04-10 16:24:30 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2012-04-10 16:24:30 +0200 |
| commit | b7cd7fa81980ded55692b8cea770fd0a698ed7ec (patch) | |
| tree | 51add71d1d7b6d127e75c0a683dfd75c4004913f | |
| parent | ed6f9b47c51b6fc5540d24112883db8b6ca2931b (diff) | |
Copy three missing clsrvconf members when "merging configurations".
| -rw-r--r-- | radsecproxy.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |