diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:03:22 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:44 -0800 |
| commit | 76401c563eea5f3d5e6f3a372dc18d64b803b658 (patch) | |
| tree | d15ca4dce95c25eaa8d4128e23d24f696e478804 /source3 | |
| parent | 8989309382e47cf0a2f23e2b0a0a7a767da37568 (diff) | |
| download | samba-76401c563eea5f3d5e6f3a372dc18d64b803b658.tar.gz samba-76401c563eea5f3d5e6f3a372dc18d64b803b658.tar.xz samba-76401c563eea5f3d5e6f3a372dc18d64b803b658.zip | |
param: Rename variable used for lp_lprmcommand szLprmcommand
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d6dcca2cfa..e3c6c6d54c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -160,7 +160,7 @@ static struct loadparm_service sDefault = .szCupsOptions = NULL, .printcommand = NULL, .lpqcommand = NULL, - .szLprmcommand = NULL, + .lprmcommand = NULL, .szLppausecommand = NULL, .szLpresumecommand = NULL, .szQueuepausecommand = NULL, @@ -386,14 +386,14 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_LPRNT: case PRINT_LPROS2: string_set(&pService->lpqcommand, "lpq -P'%p'"); - string_set(&pService->szLprmcommand, "lprm -P'%p' %j"); + string_set(&pService->lprmcommand, "lprm -P'%p' %j"); string_set(&pService->printcommand, "lpr -r -P'%p' %s"); break; case PRINT_LPRNG: case PRINT_PLP: string_set(&pService->lpqcommand, "lpq -P'%p'"); - string_set(&pService->szLprmcommand, "lprm -P'%p' %j"); + string_set(&pService->lprmcommand, "lprm -P'%p' %j"); string_set(&pService->printcommand, "lpr -r -P'%p' %s"); string_set(&pService->szQueuepausecommand, "lpc stop '%p'"); string_set(&pService->szQueueresumecommand, "lpc start '%p'"); @@ -406,7 +406,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->lpqcommand, "%p"); - string_set(&pService->szLprmcommand, ""); + string_set(&pService->lprmcommand, ""); string_set(&pService->printcommand, ""); string_set(&pService->szLppausecommand, ""); string_set(&pService->szLpresumecommand, ""); @@ -417,7 +417,7 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_SYSV: case PRINT_HPUX: string_set(&pService->lpqcommand, "lpstat -o%p"); - string_set(&pService->szLprmcommand, "cancel %p-%j"); + string_set(&pService->lprmcommand, "cancel %p-%j"); string_set(&pService->printcommand, "lp -c -d%p %s; rm %s"); string_set(&pService->szQueuepausecommand, "disable %p"); string_set(&pService->szQueueresumecommand, "enable %p"); @@ -429,7 +429,7 @@ static void init_printer_values(struct loadparm_service *pService) case PRINT_QNX: string_set(&pService->lpqcommand, "lpq -P%p"); - string_set(&pService->szLprmcommand, "lprm -P%p %j"); + string_set(&pService->lprmcommand, "lprm -P%p %j"); string_set(&pService->printcommand, "lp -r -P%p %s"); break; @@ -461,7 +461,7 @@ static void init_printer_values(struct loadparm_service *pService) tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j", tdbfile); - string_set(&pService->szLprmcommand, + string_set(&pService->lprmcommand, tmp ? tmp : "vlp lprm %p %j"); tmp = talloc_asprintf(tmp_ctx, "vlp %s lppause %%p %%j", |