s/VERBOSITY/VERBOSE/g on the server side for consistency purposes.
authorFranck Joncourt <franck@debian.org>
Tue, 25 Jun 2013 19:56:53 +0000 (21:56 +0200)
committerFranck Joncourt <franck@debian.org>
Tue, 25 Jun 2013 19:56:53 +0000 (21:56 +0200)
server/cmd_opts.h
server/config_init.c
server/fwknopd_common.h

index b5c6710..3f818fe 100644 (file)
@@ -107,7 +107,7 @@ static char *config_map[NUMBER_OF_CONFIG_ENTRIES] = {
 #endif
     "GPG_HOME_DIR",
     "FIREWALL_EXE",
-    "VERBOSITY"
+    "VERBOSE"
 };
 
 
index 920d9b3..17652ef 100644 (file)
@@ -762,14 +762,14 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
 
     /* Set up the verbosity level according to the value found in the
      * config files */
-    if (opts->config[CONF_VERBOSITY] != NULL)
+    if (opts->config[CONF_VERBOSE] != NULL)
     {
-        opts->verbose = strtol_wrapper(opts->config[CONF_VERBOSITY], 0, -1,
+        opts->verbose = strtol_wrapper(opts->config[CONF_VERBOSE], 0, -1,
                                        NO_EXIT_UPON_ERR, &is_err);
         if(is_err != FKO_SUCCESS)
         {
-            log_msg(LOG_ERR, "[*] VERBOSITY value '%s' not in the range (>0)",
-                opts->config[CONF_VERBOSITY]);
+            log_msg(LOG_ERR, "[*] VERBOSE value '%s' not in the range (>0)",
+                opts->config[CONF_VERBOSE]);
             clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE);
         }
     }
index b2277dc..6e85e39 100644 (file)
@@ -251,7 +251,7 @@ enum {
 #endif
     CONF_GPG_HOME_DIR,
     CONF_FIREWALL_EXE,
-    CONF_VERBOSITY,
+    CONF_VERBOSE,
 
     NUMBER_OF_CONFIG_ENTRIES  /* Marks the end and number of entries */
 };