Correct changelog entry for RADSECPROXY-33.

[libradsec.git] / radsecproxy.h

diff --git a/radsecproxy.h b/radsecproxy.h
index 03ae54c..dc09b1e 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
+ * Copyright (C) 2010,2011,2012 NORDUnet A/S
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,7 @@
 
 #define DEBUG_LEVEL 2
 
-#define CONFIG_MAIN "/etc/radsecproxy.conf"
+#define CONFIG_MAIN SYSCONFDIR"/radsecproxy.conf"
 
 /* MAX_REQUESTS must be 256 due to Radius' 8 bit ID field */
 #define MAX_REQUESTS 256
@@ -45,16 +45,18 @@ enum rsp_fticks_reporting_type {
 };
 
 enum rsp_fticks_mac_type {
-    RSP_FTICKS_MAC_STATIC = 0, /* Default.  */
+    RSP_FTICKS_MAC_STATIC = 0,
     RSP_FTICKS_MAC_ORIGINAL,
     RSP_FTICKS_MAC_VENDOR_HASHED,
-    RSP_FTICKS_MAC_VENDOR_KEY_HASHED,
+    RSP_FTICKS_MAC_VENDOR_KEY_HASHED, /* Default.  */
     RSP_FTICKS_MAC_FULLY_HASHED,
     RSP_FTICKS_MAC_FULLY_KEY_HASHED
 };
 
 struct options {
+    char *pidfile;
     char *logdestination;
+    char *ftickssyslogfacility;
     char *ttlattr;
     uint32_t ttlattrtype[2];
     uint8_t addttl;
@@ -130,6 +132,7 @@ struct clsrvconf {
     struct list *clients;
     struct server *servers;
     char *fticks_viscountry;
+    char *fticks_visinst;
 };
 
 #include "tlscommon.h"
@@ -157,6 +160,7 @@ struct server {
     uint8_t connectionok;
     uint8_t lostrqs;
     uint8_t dynstartup;
+    uint8_t dynfailing;
     char *dynamiclookuparg;
     int nextid;
     struct timeval lastrcv;