Warn users when were screwing with the values they set

diff --git a/src/include/conffile.h b/src/include/conffile.h
index 01a8f61..89fa992 100644 (file)
--- a/src/include/conffile.h
+++ b/src/include/conffile.h
@@ -47,6 +47,16 @@ typedef struct conf_data CONF_DATA;
 #define PW_TYPE_ATTRIBUTE      (1 << 12)       //!< CONF_PAIR value must exist in the dictionary as an attribute.
 #define PW_TYPE_SECRET         (1 << 13)       //!< don't print it when debug_flag==2.
 
+#define FR_INTEGER_COND_CHECK(_name, _var, _cond, _new)\
+do {\
+       if (!(_cond)) {\
+               WARN("WARNING: Ignoring \"" _name " = %i\", forcing to \"" _name " = %i\"", _var, _new);\
+               _var = _new;\
+       }\
+} while (0)
+
+#define FR_INTEGER_BOUND_CHECK(_name, _var, _op, _bound) FR_INTEGER_COND_CHECK(_name, _var, (_var _op _bound), _bound)
+
 typedef struct CONF_PARSER {
   char const *name;
   int type;                    /* PW_TYPE_STRING, etc. */

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 2d066e2..6ad7459 100644 (file)
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -900,10 +900,19 @@ do {\
                default_log.colourise = false;
        }
 
-       if (mainconfig.max_request_time == 0) mainconfig.max_request_time = 100;
-       if (mainconfig.reject_delay > 5) mainconfig.reject_delay = 5;
-       if (mainconfig.cleanup_delay > 5) mainconfig.cleanup_delay =5;
+       /*
+        *      Starting the server, WITHOUT "-x" on the
+        *      command-line: use whatever is in the config
+        *      file.
+        */
+       if (debug_flag == 0) {
+               debug_flag = mainconfig.debug_level;
+       }
+       fr_debug_flag = debug_flag;
 
+       FR_INTEGER_COND_CHECK("max_request_time", mainconfig.max_request_time, (mainconfig.max_request_time != 0), 100);
+       FR_INTEGER_BOUND_CHECK("reject_delay", mainconfig.reject_delay, <=, 10);
+       FR_INTEGER_BOUND_CHECK("cleanup_delay", mainconfig.cleanup_delay, <=, 10);
        /*
         *      Free the old configuration items, and replace them
         *      with the new ones.
@@ -932,16 +941,6 @@ do {\
        xlat_register("getclient", xlat_getclient, NULL, NULL);
 
        /*
-        *      Starting the server, WITHOUT "-x" on the
-        *      command-line: use whatever is in the config
-        *      file.
-        */
-       if (debug_flag == 0) {
-               debug_flag = mainconfig.debug_level;
-       }
-       fr_debug_flag = debug_flag;
-
-       /*
         *  Go update our behaviour, based on the configuration
         *  changes.
         */
@@ -950,10 +949,8 @@ do {\
         *      Sanity check the configuration for internal
         *      consistency.
         */
-       if (mainconfig.reject_delay > mainconfig.cleanup_delay) {
-               mainconfig.reject_delay = mainconfig.cleanup_delay;
-       }
-       if (mainconfig.reject_delay < 0) mainconfig.reject_delay = 0;
+       FR_INTEGER_BOUND_CHECK("reject_delay", mainconfig.reject_delay, <=, mainconfig.cleanup_delay);
+       FR_INTEGER_BOUND_CHECK("reject_delay", mainconfig.reject_delay, >=, 0);
 
        if (chroot_dir) {
                if (chdir(radlog_dir) < 0) {

diff --git a/src/main/realms.c b/src/main/realms.c
index d5b436d..f2c25b1 100644 (file)
--- a/src/main/realms.c
+++ b/src/main/realms.c
@@ -724,47 +724,44 @@ static int home_server_add(realm_config_t *rc, CONF_SECTION *cs)
        }
 #endif
 
-       if (home->max_outstanding < 8) home->max_outstanding = 8;
-       if (home->max_outstanding > 65536*16) home->max_outstanding = 65536*16;
+       FR_INTEGER_BOUND_CHECK("max_outstanding", home->max_outstanding, >=, 8);
+       FR_INTEGER_BOUND_CHECK("max_outstanding", home->max_outstanding, <=, 65536*16);
 
-       if (home->ping_interval < 6) home->ping_interval = 6;
-       if (home->ping_interval > 120) home->ping_interval = 120;
+       FR_INTEGER_BOUND_CHECK("ping_interval", home->ping_interval, >=, 6);
+       FR_INTEGER_BOUND_CHECK("ping_interval", home->ping_interval, <=, 120);
 
-       if (home->response_window < 1) home->response_window = 1;
-       if (home->response_window > 60) home->response_window = 60;
-       if (home->response_window > mainconfig.max_request_time) home->response_window = mainconfig.max_request_time;
+       FR_INTEGER_BOUND_CHECK("response_window", home->response_window, >=, 1);
+       FR_INTEGER_BOUND_CHECK("response_window", home->response_window, <=, 60);
+       FR_INTEGER_BOUND_CHECK("response_window", home->response_window, <=, mainconfig.max_request_time);
 
-       if (home->zombie_period < 1) home->zombie_period = 1;
-       if (home->zombie_period > 120) home->zombie_period = 120;
+       FR_INTEGER_BOUND_CHECK("zombie_period", home->zombie_period, >=, 1);
+       FR_INTEGER_BOUND_CHECK("zombie_period", home->zombie_period, <=, 120);
+       FR_INTEGER_BOUND_CHECK("zombie_period", home->zombie_period, >=, home->response_window);
 
-       if (home->zombie_period < home->response_window) {
-               home->zombie_period = home->response_window;
-       }
-
-       if (home->num_pings_to_alive < 3) home->num_pings_to_alive = 3;
-       if (home->num_pings_to_alive > 10) home->num_pings_to_alive = 10;
+       FR_INTEGER_BOUND_CHECK("num_pings_to_alive", home->num_pings_to_alive, >=, 3);
+       FR_INTEGER_BOUND_CHECK("num_pings_to_alive", home->num_pings_to_alive, <=, 10);
 
-       if (home->ping_timeout < 3) home->ping_timeout = 3;
-       if (home->ping_timeout > 10) home->ping_timeout = 10;
+       FR_INTEGER_BOUND_CHECK("ping_timeout", home->ping_timeout, >=, 3);
+       FR_INTEGER_BOUND_CHECK("ping_timeout", home->ping_timeout, <=, 10);
 
-       if (home->revive_interval < 60) home->revive_interval = 60;
-       if (home->revive_interval > 3600) home->revive_interval = 3600;
+       FR_INTEGER_BOUND_CHECK("revive_interval", home->revive_interval, >=, 60);
+       FR_INTEGER_BOUND_CHECK("revive_interval", home->revive_interval, <=, 3600);
 
 #ifdef WITH_COA
-       if (home->coa_irt < 1) home->coa_irt = 1;
-       if (home->coa_irt > 5) home->coa_irt = 5;
+       FR_INTEGER_BOUND_CHECK("coa_irt", home->coa_irt, >=, 1);
+       FR_INTEGER_BOUND_CHECK("coa_irt", home->coa_irt, <=, 5);
 
-       if (home->coa_mrc < 0) home->coa_mrc = 0;
-       if (home->coa_mrc > 20 ) home->coa_mrc = 20;
+       FR_INTEGER_BOUND_CHECK("coa_mrc", home->coa_mrc, >=, 0);
+       FR_INTEGER_BOUND_CHECK("coa_mrc", home->coa_mrc, <=, 20);
 
-       if (home->coa_mrt < 0) home->coa_mrt = 0;
-       if (home->coa_mrt > 30 ) home->coa_mrt = 30;
+       FR_INTEGER_BOUND_CHECK("coa_mrt", home->coa_mrt, >=, 0);
+       FR_INTEGER_BOUND_CHECK("coa_mrt", home->coa_mrt, <=, 30);
 
-       if (home->coa_mrd < 5) home->coa_mrd = 5;
-       if (home->coa_mrd > 60 ) home->coa_mrd = 60;
+       FR_INTEGER_BOUND_CHECK("coa_mrd", home->coa_mrd, >=, 5);
+       FR_INTEGER_BOUND_CHECK("coa_mrd", home->coa_mrd, <=, 60);
 #endif
 
-       if (home->limit.max_connections > 1024) home->limit.max_connections = 1024;
+       FR_INTEGER_BOUND_CHECK("max_connections", home->limit.max_connections, <=, 1024);
 
 #ifdef WITH_TCP
        /*