Added "max verbosity" global parameter that allows you to configure

a higher debug level instead of the default of level-l verbosity.

diff --git a/loadparm.c b/loadparm.c
index d9ce157..dfadc44 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -101,14 +101,14 @@ typedef struct
        char *motd_file;
        char *log_file;
        char *pid_file;
        char *motd_file;
        char *log_file;
        char *pid_file;

-       int syslog_facility;

        char *socket_options;
        char *socket_options;

+       int syslog_facility;
+       int max_verbosity;

 } global;
 
 static global Globals;
 
 
 } global;
 
 static global Globals;
 
 

-

 /*
  * This structure describes a single service.
  */
 /*
  * This structure describes a single service.
  */


@@ -268,6 +268,7 @@ static struct parm_struct parm_table[] =
   {"socket options",   P_STRING,  P_GLOBAL, &Globals.socket_options,NULL,  0},
   {"log file",         P_STRING,  P_GLOBAL, &Globals.log_file,      NULL,  0},
   {"pid file",         P_STRING,  P_GLOBAL, &Globals.pid_file,      NULL,  0},
   {"socket options",   P_STRING,  P_GLOBAL, &Globals.socket_options,NULL,  0},
   {"log file",         P_STRING,  P_GLOBAL, &Globals.log_file,      NULL,  0},
   {"pid file",         P_STRING,  P_GLOBAL, &Globals.pid_file,      NULL,  0},

+  {"max verbosity",    P_INTEGER, P_GLOBAL, &Globals.max_verbosity, NULL,  0},

 
   {"timeout",          P_INTEGER, P_LOCAL,  &sDefault.timeout,     NULL,  0},
   {"max connections",  P_INTEGER, P_LOCAL,  &sDefault.max_connections,NULL, 0},
 
   {"timeout",          P_INTEGER, P_LOCAL,  &sDefault.timeout,     NULL,  0},
   {"max connections",  P_INTEGER, P_LOCAL,  &sDefault.max_connections,NULL, 0},


@@ -304,10 +305,11 @@ Initialise the global parameter structure.
 ***************************************************************************/
 static void init_globals(void)
 {
 ***************************************************************************/
 static void init_globals(void)
 {

-       memset(&Globals, 0, sizeof(Globals));
+       memset(&Globals, 0, sizeof Globals);

 #ifdef LOG_DAEMON
        Globals.syslog_facility = LOG_DAEMON;
 #endif
 #ifdef LOG_DAEMON
        Globals.syslog_facility = LOG_DAEMON;
 #endif

+       Globals.max_verbosity = 1;

 }
 
 /***************************************************************************
 }
 
 /***************************************************************************


@@ -347,6 +349,7 @@ FN_GLOBAL_STRING(lp_log_file, &Globals.log_file)
 FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
 FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
 FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
 FN_GLOBAL_STRING(lp_pid_file, &Globals.pid_file)
 FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
 FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)

+FN_GLOBAL_INTEGER(lp_max_verbosity, &Globals.max_verbosity)

 
 FN_LOCAL_STRING(lp_name, name)
 FN_LOCAL_STRING(lp_comment, comment)
 
 FN_LOCAL_STRING(lp_name, name)
 FN_LOCAL_STRING(lp_comment, comment)