Merge branch 'master' into fticks_syslog2

[radsecproxy.git] / radsecproxy.c

diff --git a/radsecproxy.c b/radsecproxy.c
index e780b96..fe43cb7 100644 (file)
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -3082,10 +3082,10 @@ void getmainconfig(const char *configfile) {
 #endif
            "Rewrite", CONF_CBK, confrewrite_cb, NULL,
 #if defined(WANT_FTICKS)
-           "FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
            "FTicksReporting", CONF_STR, &fticks_reporting_str,
            "FTicksMAC", CONF_STR, &fticks_mac_str,
            "FTicksKey", CONF_STR, &fticks_key_str,
+           "FTicksSyslogFacility", CONF_STR, &options.ftickssyslogfacility,
 #endif
            NULL
            ))
@@ -3243,10 +3243,11 @@ int radsecproxy_main(int argc, char **argv) {
     if (!foreground) {
        debug_set_destination(options.logdestination
                               ? options.logdestination
-                              : "x-syslog:///", DEBUG_LOG);
+                              : "x-syslog:///", LOG_TYPE_DEBUG);
 #if defined(WANT_FTICKS)
        if (options.ftickssyslogfacility) {
-            debug_set_destination(options.ftickssyslogfacility, FTICKS_LOG);
+            debug_set_destination(options.ftickssyslogfacility,
+                                  LOG_TYPE_FTICKS);
             free(options.ftickssyslogfacility);
        }
 #endif