X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=radsecproxy.c;h=9a4d2bc8660075e38d91ae139772778317fcb357;hb=cf23603e9341e513357abbba3643c4d0c0b897a0;hp=4d6cc1ab74fbf0fdecb58f62cc76980e20f5fb75;hpb=68d851156019f743618b39d31f7674981ed18a71;p=radsecproxy.git

diff --git a/radsecproxy.c b/radsecproxy.c
index 4d6cc1a..9a4d2bc 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;
@@ -2758,7 +2761,7 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
 
     if (!addhostport(&conf->hostports, conf->hostsrc, conf->pdef->portdefault, 1) ||
 	!resolvehostports(conf->hostports, conf->pdef->socktype))
-	debugx(1, DBG_ERR, "resolve failed, exiting");
+	debugx(1, DBG_ERR, "%s: resolve failed, exiting", __func__);
 
     if (!conf->secret) {
 	if (!conf->pdef->secretdefault)
@@ -2820,7 +2823,7 @@ int compileserverconfig(struct clsrvconf *conf, const char *block) {
     }
 
     if (!conf->dynamiclookupcommand && !resolvehostports(conf->hostports, conf->pdef->socktype)) {
-	debug(DBG_ERR, "resolve failed, exiting");
+	debug(DBG_ERR, "%s: resolve failed", __func__);
 	return 0;
     }
     return 1;
@@ -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) {
@@ -3078,6 +3082,7 @@ void getmainconfig(const char *configfile) {
 	    "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
 	    "SourceDTLS", CONF_STR, &sourcearg[RAD_DTLS],
 #endif
+            "PidFile", CONF_STR, &options.pidfile,
 	    "TTLAttribute", CONF_STR, &options.ttlattr,
 	    "addTTL", CONF_LINT, &addttl,
 	    "LogLevel", CONF_LINT, &loglevel,
@@ -3276,6 +3281,8 @@ int radsecproxy_main(int argc, char **argv) {
 
     debug_timestamp_on();
     debug(DBG_INFO, "radsecproxy revision %s starting", PACKAGE_VERSION);
+    if (!pidfile)
+        pidfile = options.pidfile;
     if (pidfile && !createpidfile(pidfile))
 	debugx(1, DBG_ERR, "failed to create pidfile %s: %s", pidfile, strerror(errno));