diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-10 15:06:41 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-10 15:26:44 +1300 |
| commit | 98e8126b05f69646cfb035e3ebea71b3172c01e9 (patch) | |
| tree | 968debbc74f87f8e6377e50588a22247151f15cd /lib | |
| parent | a416edfe3ada6b0541ae3450bcb1916ca5429d43 (diff) | |
| download | samba-98e8126b05f69646cfb035e3ebea71b3172c01e9.tar.gz samba-98e8126b05f69646cfb035e3ebea71b3172c01e9.tar.xz samba-98e8126b05f69646cfb035e3ebea71b3172c01e9.zip | |
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/loadparm.c | 3 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 1 | ||||
| -rw-r--r-- | lib/param/param_table.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 6bebe0d335..d3bd85c013 100644 --- 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 27eacf6f80..5c941143c6 100644 --- 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 30222a9623..09e041bbea 100644 --- 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, |