diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:05 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:14 -0800 |
| commit | f8e7ea278d077e6c699258b63dcaf0bf4adb1c8c (patch) | |
| tree | 9b977b3eec58d0609ae86d7e7d45c4080b29132b | |
| parent | 35dd3a749984da550ff5081b0ca01394474b444f (diff) | |
| download | samba-f8e7ea278d077e6c699258b63dcaf0bf4adb1c8c.tar.gz samba-f8e7ea278d077e6c699258b63dcaf0bf4adb1c8c.tar.xz samba-f8e7ea278d077e6c699258b63dcaf0bf4adb1c8c.zip | |
param: rename lp function and variable from "addprinter_cmd" to "addprinter_command"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index f7605a097f..634bf82085 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -370,7 +370,7 @@ FN_GLOBAL_STRING(abort_shutdown_script, abort_shutdown_script) FN_GLOBAL_STRING(add_group_script, add_group_script) FN_GLOBAL_STRING(add_machine_script, add_machine_script) FN_GLOBAL_STRING(addport_command, addport_command) -FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd) +FN_GLOBAL_STRING(addprinter_command, addprinter_command) FN_GLOBAL_STRING(add_share_command, add_share_command) FN_GLOBAL_STRING(add_user_script, add_user_script) FN_GLOBAL_STRING(add_user_to_group_script, add_user_to_group_script) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index e49981c229..1de03096d1 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2257,7 +2257,7 @@ static struct parm_struct parm_table[] = { .label = "addprinter command", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(addprinter_cmd), + .offset = GLOBAL_VAR(addprinter_command), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 48cd17c93b..d099250838 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -6240,7 +6240,7 @@ static bool add_printer_hook(TALLOC_CTX *ctx, struct security_token *token, const char *remote_machine, struct messaging_context *msg_ctx) { - char *cmd = lp_addprinter_cmd(talloc_tos()); + char *cmd = lp_addprinter_command(talloc_tos()); char **qlines; char *command = NULL; int numlines; @@ -6795,7 +6795,7 @@ static WERROR update_printer(struct pipes_struct *p, /* Call addprinter hook */ /* Check changes to see if this is really needed */ - if (*lp_addprinter_cmd(talloc_tos()) && + if (*lp_addprinter_command(talloc_tos()) && (!strequal(printer->drivername, old_printer->drivername) || !strequal(printer->comment, old_printer->comment) || !strequal(printer->portname, old_printer->portname) || @@ -8133,7 +8133,7 @@ static WERROR spoolss_addprinterex_level_2(struct pipes_struct *p, /* FIXME!!! smbd should check to see if the driver is installed before trying to add a printer like this --jerry */ - if (*lp_addprinter_cmd(talloc_tos()) ) { + if (*lp_addprinter_command(talloc_tos()) ) { char *raddr; raddr = tsocket_address_inet_addr_string(p->remote_address, |