From 5413d1c48c9e37adada0b7c74018d7da5746d188 Mon Sep 17 00:00:00 2001
From: Franck Joncourt <franck@debian.org>
Date: Tue, 25 Jun 2013 22:04:54 +0200
Subject: [PATCH] * Mentionned the VERBOSE variable in fwknopd.conf. * Made
 sure the -v command line switch overrides the value of the   VERBOSE variable
 set in an fwknopd.conf file.

---
 server/config_init.c | 8 ++------
 server/fwknopd.conf  | 7 +++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/server/config_init.c b/server/config_init.c
index 17652ef7..98f10e1a 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -685,11 +685,6 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
                 clean_exit(opts, NO_FW_CLEANUP, EXIT_SUCCESS);
                 break;
 
-            /* Verbosity level */
-            case 'v':
-                opts->verbose++;
-                break;
-
             /* Look for configuration file arg.
             */
             case 'c':
@@ -871,8 +866,9 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
             case 'S':
                 opts->status = 1;
                 break;
-            /* Verbosity level - handled previously */
+            /* Verbosity level */
             case 'v':
+                opts->verbose++;
                 break;
             case 'V':
                 fprintf(stdout, "fwknopd server %s\n", MY_VERSION);
diff --git a/server/fwknopd.conf b/server/fwknopd.conf
index 679d8fb8..74384830 100644
--- a/server/fwknopd.conf
+++ b/server/fwknopd.conf
@@ -26,6 +26,13 @@
 ##############################################################################
 #
 
+#
+# Define the default verbosity level the fwknop server should use.
+# A value of "0" is the default verbosity level. Setting it up to "1" or
+# higher will allow debugging messges be displayed.
+#
+#VERBOSE                     0;
+
 # Define the ethernet interface on which we will sniff packets.
 # Default if not set is eth0.  The '-i <intf>' command line option overrides
 # the PCAP_INTF setting.