From 10fdbb509ccaa8dca454f2e1a19dfa93d3951c86 Mon Sep 17 00:00:00 2001
From: Franck Joncourt <franck@debian.org>
Date: Tue, 25 Jun 2013 21:56:53 +0200
Subject: [PATCH] s/VERBOSITY/VERBOSE/g on the server side for consistency
 purposes.

---
 server/cmd_opts.h       | 2 +-
 server/config_init.c    | 8 ++++----
 server/fwknopd_common.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/cmd_opts.h b/server/cmd_opts.h
index b5c67100..3f818fea 100644
--- a/server/cmd_opts.h
+++ b/server/cmd_opts.h
@@ -107,7 +107,7 @@ static char *config_map[NUMBER_OF_CONFIG_ENTRIES] = {
 #endif
     "GPG_HOME_DIR",
     "FIREWALL_EXE",
-    "VERBOSITY"
+    "VERBOSE"
 };
 
 
diff --git a/server/config_init.c b/server/config_init.c
index 464c303b..7169c6dc 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -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);
         }
     }
diff --git a/server/fwknopd_common.h b/server/fwknopd_common.h
index b2277dc1..6e85e39a 100644
--- a/server/fwknopd_common.h
+++ b/server/fwknopd_common.h
@@ -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 */
 };