Remove compiler warnings

diff --git a/src/main/radconf2xml.c b/src/main/radconf2xml.c
index 7d9a8eb..bd9f347 100644 (file)
--- a/src/main/radconf2xml.c
+++ b/src/main/radconf2xml.c
@@ -34,7 +34,7 @@ RCSID("$Id$")
 /*
  *     For configuration file stuff.
  */
-char *radius_dir = RADDBDIR;
+const char *raddb_dir = RADDBDIR;
 const char *progname = "radconf2xml";
 
 /*
@@ -84,7 +84,7 @@ int main(int argc, char **argv)
                                fprintf(stderr, "%s: -d and -f cannot be used together.\n", progname);
                                exit(1);
                        }
-                       radius_dir = optarg;
+                       raddb_dir = optarg;
                        break;
 
                default:
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
                }
        }
 
-       snprintf(buffer, sizeof(buffer), "%s/%s.conf", radius_dir, name);
+       snprintf(buffer, sizeof(buffer), "%s/%s.conf", raddb_dir, name);
        cs = cf_file_read(buffer);
        if (!cs) {
                fprintf(stderr, "%s: Errors reading %s\n",

diff --git a/src/main/radwho.c b/src/main/radwho.c
index f906d57..736c564 100644 (file)
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -68,7 +68,7 @@ const char *radlog_dir = NULL;
 const char *radutmp_file = NULL;
 int check_config = FALSE;
 
-char *radius_dir = NULL;
+const char *raddb_dir = NULL;
 const char *radacct_dir = NULL;
 const char *radlib_dir = NULL;
 uint32_t myip = INADDR_ANY;
@@ -316,11 +316,11 @@ int main(int argc, char **argv)
        uint32_t nas_ip_address = INADDR_NONE;
        int zap = 0;
 
-       radius_dir = RADIUS_DIR;
+       raddb_dir = RADIUS_DIR;
 
        while((c = getopt(argc, argv, "d:fnN:sSipP:crRu:U:Z")) != EOF) switch(c) {
                case 'd':
-                       radius_dir = optarg;
+                       raddb_dir = optarg;
                        break;
                case 'f':
                        fingerd++;
@@ -407,7 +407,7 @@ int main(int argc, char **argv)
        mainconfig.radlog_dest = RADLOG_STDOUT;
 
         /* Read radiusd.conf */
-       snprintf(buffer, sizeof(buffer), "%.200s/radiusd.conf", radius_dir);
+       snprintf(buffer, sizeof(buffer), "%.200s/radiusd.conf", raddb_dir);
        maincs = cf_file_read(buffer);
        if (!maincs) {
                fprintf(stderr, "%s: Error reading radiusd.conf.\n", argv[0]);