projects
/
radsecproxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed6f9b4
)
Copy three missing clsrvconf members when "merging configurations".
author
Linus Nordberg
<linus@nordu.net>
Tue, 10 Apr 2012 14:24:30 +0000
(16:24 +0200)
committer
Linus Nordberg
<linus@nordu.net>
Tue, 10 Apr 2012 14:24:30 +0000
(16:24 +0200)
radsecproxy.c
patch
|
blob
|
history
diff --git
a/radsecproxy.c
b/radsecproxy.c
index
2facb2b
..
845c208
100644
(file)
--- 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->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;
return 0;
if (src->pdef)
dst->pdef = src->pdef;