formatting and skipping openlog call for FTOCKS_LOG

parent e41e5198
......@@ -104,22 +104,21 @@ int debug_set_destination(char *dest, int log_type) {
break;
if (!facstrings[i])
debugx(1, DBG_ERR, "Unknown syslog facility %s", dest);
#if defined(WANT_FTICKS)
if (log_type==FTICKS_LOG)
fticks_syslogfacility = facvals[i];
else
#endif
if (log_type!=FTICKS_LOG)
debug_syslogfacility = facvals[i];
} else {
#if defined(WANT_FTICKS)
if (log_type==FTICKS_LOG)
fticks_syslogfacility = 0;
else
#endif
if (log_type!=FTICKS_LOG)
debug_syslogfacility = LOG_DAEMON;
}
if (log_type==FTICKS_LOG) {
if (fticks_syslogfacility && !debug_syslogfacility) {
openlog(debug_ident, LOG_PID, fticks_syslogfacility);
}
} else
openlog(debug_ident, LOG_PID, debug_syslogfacility);
openlog(debug_ident, LOG_PID, debug_syslogfacility);
return 1;
}
debug(DBG_ERR, "Unknown log destination, exiting %s", dest);
......
......@@ -1668,7 +1668,7 @@ void replyh(struct server *server, unsigned char *buf) {
}
#if defined(WANT_FTICKS)
if (msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject)
if (msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject)
if (options.fticks_reporting && from->conf->fticks_viscountry != NULL)
fticks_log(&options, from, msg, rqout);
#endif
......@@ -3082,7 +3082,7 @@ void getmainconfig(const char *configfile) {
#endif
"Rewrite", CONF_CBK, confrewrite_cb, NULL,
#if defined(WANT_FTICKS)
"FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
"FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
"FTicksReporting", CONF_STR, &fticks_reporting_str,
"FTicksMAC", CONF_STR, &fticks_mac_str,
"FTicksKey", CONF_STR, &fticks_key_str,
......@@ -3241,12 +3241,14 @@ int radsecproxy_main(int argc, char **argv) {
else if (options.loglevel)
debug_set_level(options.loglevel);
if (!foreground) {
debug_set_destination(options.logdestination ? options.logdestination : "x-syslog:///", DEBUG_LOG);
debug_set_destination(options.logdestination
? options.logdestination
: "x-syslog:///", DEBUG_LOG);
#if defined(WANT_FTICKS)
if (options.ftickssyslogfacility) {
debug_set_destination(options.ftickssyslogfacility, FTICKS_LOG);
free(options.ftickssyslogfacility);
}
debug_set_destination(options.ftickssyslogfacility, FTICKS_LOG);
free(options.ftickssyslogfacility);
}
#endif
}
free(options.logdestination);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment