changed config location and updated README

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@121 e88ac4ed-0b26-0410-9574-a7f39faa03bf

diff --git a/README b/README
index 788ee5a..995055d 100644 (file)
--- a/README
+++ b/README
@@ -11,12 +11,13 @@ you can specify the location with the "-c" command line
 option (see below). See the enclosed example file for further
 instructions.
 
-There are three options that may be specified on the command line.
+There are four options that may be specified on the command line.
 "-c configfile" to specify a non-default config file path;
 "-d loglevel" to set a loglevel of 1, 2, 3 or 4 where 4 is the most
 detailed; and "-f" to run the proxy in the foreground with logging
 to stderr. Without "-f" the default is to detach as a daemon and
-log to syslog.
+log to syslog. Finally "-v" just prints version information and
+exits.
 
 Thanks to Stefan Winter and Andreas Solberg for making me do this,
 and the funding from GEANT2. Stefan as well as Kolbjørn Barmen

diff --git a/radsecproxy.h b/radsecproxy.h
index 6915b2a..c6b2b19 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -8,9 +8,7 @@
 
 #define DEBUG_LEVEL 3
 
-#define CONFIG_MAIN "/etc/radsecproxy/radsecproxy.conf"
-#define CONFIG_SERVERS "/etc/radsecproxy/servers.conf"
-#define CONFIG_CLIENTS "/etc/radsecproxy/clients.conf"
+#define CONFIG_MAIN "/etc/radsecproxy.conf"
 
 /* MAX_REQUESTS must be 256 due to Radius' 8 bit ID field */
 #define MAX_REQUESTS 256