sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

param: Rename variable used for lp_panic_action szPanicAction

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andrew Bartlett
2013-12-24 16:04:32 +13:00
committed by Jeremy Allison
parent cae093c4e2
commit ceda82f2ad
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/param/loadparm.c
View File

@ -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);

2
lib/param/param_functions.c
View File

@ -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)

2
lib/param/param_table.c
View File

@ -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,

2
source3/param/loadparm.c
View File

@ -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);