From 8ec3e110047034c0eb495c3d3bde1f1ef6ee7b18 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 4 Feb 2014 15:09:04 +1300 Subject: [PATCH] param: rename lp function and variable from "msg_command" to "message_command" Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/smbd/message.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 3d190497a48..dd28567ec67 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -392,7 +392,7 @@ FN_GLOBAL_STRING(ldap_suffix, ldap_suffix) FN_GLOBAL_STRING(logfile, logfile) FN_GLOBAL_STRING(log_nt_token_command, log_nt_token_command) FN_GLOBAL_STRING(mangling_method, mangling_method) -FN_GLOBAL_STRING(msg_command, msg_command) +FN_GLOBAL_STRING(message_command, message_command) FN_GLOBAL_STRING(homedir_map, homedir_map) FN_GLOBAL_STRING(os2_driver_map, os2_driver_map) FN_GLOBAL_STRING(panic_action, panic_action) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 89e52e1a8bf..570b91606cf 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3400,7 +3400,7 @@ static struct parm_struct parm_table[] = { .label = "message command", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(msg_command), + .offset = GLOBAL_VAR(message_command), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/smbd/message.c b/source3/smbd/message.c index 5369f3185a3..3d91f1408db 100644 --- a/source3/smbd/message.c +++ b/source3/smbd/message.c @@ -53,7 +53,7 @@ static void msg_deliver(struct msg_state *state) char *s; mode_t mask; - if (! (*lp_msg_command(frame))) { + if (! (*lp_message_command(frame))) { DEBUG(1,("no messaging command specified\n")); goto done; } @@ -100,7 +100,7 @@ static void msg_deliver(struct msg_state *state) close(fd); /* run the command */ - s = lp_msg_command(frame); + s = lp_message_command(frame); if (s == NULL) { goto done; } @@ -150,7 +150,7 @@ void reply_sends(struct smb_request *req) START_PROFILE(SMBsends); - if (!(*lp_msg_command(talloc_tos()))) { + if (!(*lp_message_command(talloc_tos()))) { reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED); END_PROFILE(SMBsends); return; @@ -198,7 +198,7 @@ void reply_sendstrt(struct smb_request *req) START_PROFILE(SMBsendstrt); - if (!(*lp_msg_command(talloc_tos()))) { + if (!(*lp_message_command(talloc_tos()))) { reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED); END_PROFILE(SMBsendstrt); return; @@ -248,7 +248,7 @@ void reply_sendtxt(struct smb_request *req) START_PROFILE(SMBsendtxt); - if (! (*lp_msg_command(talloc_tos()))) { + if (! (*lp_message_command(talloc_tos()))) { reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED); END_PROFILE(SMBsendtxt); return; @@ -297,7 +297,7 @@ void reply_sendend(struct smb_request *req) { START_PROFILE(SMBsendend); - if (! (*lp_msg_command(talloc_tos()))) { + if (! (*lp_message_command(talloc_tos()))) { reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED); END_PROFILE(SMBsendend); return;