From ceda82f2ad74929ec3bee9c855e8da6de82ab20b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:32 +1300 Subject: [PATCH] param: Rename variable used for lp_panic_action szPanicAction Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 5 ++--- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 109dbd71c19..d35f3f8c5b2 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -95,8 +95,7 @@ static bool defaults_saved = false; char *tls_cafile; \ char *tls_crlfile; \ char *tls_dhpfile; \ - char *loglevel; \ - char *panic_action; + char *loglevel; #include "lib/param/param_global.h" @@ -2305,7 +2304,7 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx) return true; } - panic_action = lp_ctx->globals->szPanicAction; + panic_action = lp_ctx->globals->panic_action; reload_charcnv(lp_ctx); diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index c29ed019eba..d6169e25bd2 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -396,7 +396,7 @@ FN_GLOBAL_STRING(mangling_method, mangling_method) FN_GLOBAL_STRING(msg_command, msg_command) FN_GLOBAL_STRING(nis_home_map_name, nis_home_map_name) FN_GLOBAL_STRING(os2_driver_map, os2_driver_map) -FN_GLOBAL_STRING(panic_action, szPanicAction) +FN_GLOBAL_STRING(panic_action, panic_action) FN_GLOBAL_STRING(passwd_chat, szPasswdChat) FN_GLOBAL_STRING(passwd_program, szPasswdProgram) FN_GLOBAL_STRING(perfcount_module, szSMBPerfcountModule) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 531ec735120..efd97f90df7 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3832,7 +3832,7 @@ static struct parm_struct parm_table[] = { .label = "panic action", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szPanicAction), + .offset = GLOBAL_VAR(panic_action), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 95cbd070982..d65c482b93f 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -790,7 +790,7 @@ static void init_globals(bool reinit_globals) string_set(&Globals.szServerString, s); SAFE_FREE(s); #ifdef DEVELOPER - string_set(&Globals.szPanicAction, "/bin/sleep 999999999"); + string_set(&Globals.panic_action, "/bin/sleep 999999999"); #endif string_set(&Globals.socket_options, DEFAULT_SOCKET_OPTIONS); -- 2.11.4.GIT