X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=radsecproxy.c;h=845c2088bb81d774d917b060fbb4d3dff0ca9691;hb=c9352cfee235a47644b04f14637fd6a8080d164c;hp=b2794184d75db9dfc96c821e094b1701105a8e67;hpb=f41042e6afb1d12275fd3f30a1ecb309b83a2937;p=libradsec.git

diff --git a/radsecproxy.c b/radsecproxy.c
index b279418..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;
@@ -2944,7 +2947,8 @@ int confserver_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
 
     if (resconf || !conf->dynamiclookupcommand) {
 	if (!compileserverconfig(conf, block))
-	    goto errexit;
+            return 0; /* Don't goto errexit and free resconf -- it's
+                       * not ours to free.  */
     }
 
     if (!conf->secret) {