param: rename and move log level from LOADPARM_EXTRA_GLOBALS to param_functions.c

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 6bebe0d33581c960dba301040e40de6fac0499b6..d3bd85c013cb39d522f5997a976e7b1f5ba9a008 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -93,8 +93,7 @@ static bool defaults_saved = false;
        char *tls_certfile;                                             \
        char *tls_cafile;                                               \
        char *tls_crlfile;                                              \
-       char *tls_dhpfile;                                              \
-       char *loglevel;
+       char *tls_dhpfile;
 
 #include "lib/param/param_global.h"
 

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 27eacf6f80e366722f1c23e73b27f0711201d634..5c941143c68c5769ab259566158a38d73c22e6d3 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -413,3 +413,4 @@ FN_GLOBAL_STRING(username_map, username_map)
 FN_GLOBAL_STRING(usershare_path, usershare_path)
 FN_GLOBAL_STRING(wins_hook, wins_hook)
 FN_GLOBAL_STRING(usershare_template_share, usershare_template_share)
+FN_GLOBAL_STRING(log_level, log_level)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 30222a96235fb182f2f187c3f844b90566daddbe..09e041bbeaa91ebfb8a79fcc18424486105465b9 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1139,7 +1139,7 @@ static struct parm_struct parm_table[] = {
                .label          = "log level",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(loglevel),
+               .offset         = GLOBAL_VAR(log_level),
                .special        = handle_debug_list,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1148,7 +1148,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debuglevel",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(loglevel),
+               .offset         = GLOBAL_VAR(log_level),
                .special        = handle_debug_list,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 918eb7e9afa2a8ea6b701560a0d6bcfcafbde9db..cf37348f5d045060566adf4e6221ebb54de70ec4 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -111,7 +111,6 @@ static bool defaults_saved = false;
 #define LOADPARM_EXTRA_GLOBALS \
        struct parmlist_entry *param_opt;                               \
        char *realm_original;                                           \
-       char *loglevel;                                                 \
        int iminreceivefile;                                            \
        char *szPrintcapname;                                           \
        int CupsEncrypt;                                                \
@@ -835,7 +834,7 @@ static void init_globals(bool reinit_globals)
        Globals.syslog = 1;
        Globals.syslog_only = false;
        Globals.timestamp_logs = true;
-       string_set(&Globals.loglevel, "0");
+       string_set(&Globals.log_level, "0");
        Globals.debug_prefix_timestamp = false;
        Globals.debug_hires_timestamp = true;
        Globals.debug_pid = false;