diff options
-rw-r--r-- | lib/param/param_functions.c | 2 | ||||
-rw-r--r-- | lib/param/param_table.c | 2 | ||||
-rw-r--r-- | source3/param/loadparm.c | 14 | ||||
-rw-r--r-- | source3/printing/printing.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 2661c469a04..a68dcff2fc1 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -58,7 +58,7 @@ FN_LOCAL_LIST(valid_users, valid_users) FN_LOCAL_LIST(admin_users, admin_users) FN_LOCAL_STRING(printcommand, printcommand) FN_LOCAL_STRING(lpq_command, lpq_command) -FN_LOCAL_STRING(lprmcommand, lprmcommand) +FN_LOCAL_STRING(lprm_command, lprm_command) FN_LOCAL_STRING(lppause_command, lppause_command) FN_LOCAL_STRING(lpresume_command, lpresume_command) FN_LOCAL_STRING(queuepausecommand, queuepausecommand) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 235fdd14f57..9c3b015fd7b 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2194,7 +2194,7 @@ static struct parm_struct parm_table[] = { .label = "lprm command", .type = P_STRING, .p_class = P_LOCAL, - .offset = LOCAL_VAR(lprmcommand), + .offset = LOCAL_VAR(lprm_command), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 31d1c6a9a74..2c66770d806 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -160,7 +160,7 @@ static struct loadparm_service sDefault = .cups_options = NULL, .printcommand = NULL, .lpq_command = NULL, - .lprmcommand = NULL, + .lprm_command = NULL, .lppause_command = NULL, .lpresume_command = NULL, .queuepausecommand = NULL, @@ -382,14 +382,14 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_LPRNT: case PRINT_LPROS2: string_set(&pService->lpq_command, "lpq -P'%p'"); - string_set(&pService->lprmcommand, "lprm -P'%p' %j"); + string_set(&pService->lprm_command, "lprm -P'%p' %j"); string_set(&pService->printcommand, "lpr -r -P'%p' %s"); break; case PRINT_LPRNG: case PRINT_PLP: string_set(&pService->lpq_command, "lpq -P'%p'"); - string_set(&pService->lprmcommand, "lprm -P'%p' %j"); + string_set(&pService->lprm_command, "lprm -P'%p' %j"); string_set(&pService->printcommand, "lpr -r -P'%p' %s"); string_set(&pService->queuepausecommand, "lpc stop '%p'"); string_set(&pService->queueresumecommand, "lpc start '%p'"); @@ -402,7 +402,7 @@ static void init_printer_values(struct loadparm_service *pService) /* set the lpq command to contain the destination printer name only. This is used by cups_queue_get() */ string_set(&pService->lpq_command, "%p"); - string_set(&pService->lprmcommand, ""); + string_set(&pService->lprm_command, ""); string_set(&pService->printcommand, ""); string_set(&pService->lppause_command, ""); string_set(&pService->lpresume_command, ""); @@ -413,7 +413,7 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_SYSV: case PRINT_HPUX: string_set(&pService->lpq_command, "lpstat -o%p"); - string_set(&pService->lprmcommand, "cancel %p-%j"); + string_set(&pService->lprm_command, "cancel %p-%j"); string_set(&pService->printcommand, "lp -c -d%p %s; rm %s"); string_set(&pService->queuepausecommand, "disable %p"); string_set(&pService->queueresumecommand, "enable %p"); @@ -425,7 +425,7 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_QNX: string_set(&pService->lpq_command, "lpq -P%p"); - string_set(&pService->lprmcommand, "lprm -P%p %j"); + string_set(&pService->lprm_command, "lprm -P%p %j"); string_set(&pService->printcommand, "lp -r -P%p %s"); break; @@ -457,7 +457,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j", tdbfile); - string_set(&pService->lprmcommand, + string_set(&pService->lprm_command, tmp ? tmp : "vlp lprm %p %j"); tmp = talloc_asprintf(tmp_ctx, "vlp %s lppause %%p %%j", diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 7253eba2608..48eb450d797 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1685,7 +1685,7 @@ static void print_queue_update(struct messaging_context *msg_ctx, } lprmcommand = talloc_string_sub2(ctx, - lp_lprmcommand(talloc_tos(), snum), + lp_lprm_command(talloc_tos(), snum), "%p", lp_printername(talloc_tos(), snum), false, false, false); @@ -2147,7 +2147,7 @@ static bool print_job_delete1(struct tevent_context *ev, { result = (*(current_printif->job_delete))( lp_printername(talloc_tos(), snum), - lp_lprmcommand(talloc_tos(), snum), + lp_lprm_command(talloc_tos(), snum), pjob); /* Delete the tdb entry if the delete succeeded or the job hasn't |