sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

param: Rename variable used for lp_lpresumecommand szLpresumecommand

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:03:23 +13:00 committed by Jeremy Allison
parent d9e12da374
commit 7198e8bb8c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -60,7 +60,7 @@ FN_LOCAL_STRING(printcommand, printcommand)
FN_LOCAL_STRING(lpqcommand, lpqcommand)
FN_LOCAL_STRING(lprmcommand, lprmcommand)
FN_LOCAL_STRING(lppausecommand, lppausecommand)
FN_LOCAL_STRING(lpresumecommand, szLpresumecommand)
FN_LOCAL_STRING(lpresumecommand, lpresumecommand)
FN_LOCAL_STRING(queuepausecommand, szQueuepausecommand)
FN_LOCAL_STRING(queueresumecommand, szQueueresumecommand)
static FN_LOCAL_STRING(_printername, szPrintername)

2
lib/param/param_table.c
View File

@ -2212,7 +2212,7 @@ static struct parm_struct parm_table[] = {
.label = "lpresume command",
.type = P_STRING,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(szLpresumecommand),
.offset = LOCAL_VAR(lpresumecommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,

10
source3/param/loadparm.c
View File

@ -162,7 +162,7 @@ static struct loadparm_service sDefault =
.lpqcommand = NULL,
.lprmcommand = NULL,
.lppausecommand = NULL,
.szLpresumecommand = NULL,
.lpresumecommand = NULL,
.szQueuepausecommand = NULL,
.szQueueresumecommand = NULL,
.szPrintername = NULL,
@ -398,7 +398,7 @@ static void init_printer_values(struct loadparm_service *pService)
string_set(&pService->szQueuepausecommand, "lpc stop '%p'");
string_set(&pService->szQueueresumecommand, "lpc start '%p'");
string_set(&pService->lppausecommand, "lpc hold '%p' %j");
string_set(&pService->szLpresumecommand, "lpc release '%p' %j");
string_set(&pService->lpresumecommand, "lpc release '%p' %j");
break;
case PRINT_CUPS:
@ -409,7 +409,7 @@ static void init_printer_values(struct loadparm_service *pService)
string_set(&pService->lprmcommand, "");
string_set(&pService->printcommand, "");
string_set(&pService->lppausecommand, "");
string_set(&pService->szLpresumecommand, "");
string_set(&pService->lpresumecommand, "");
string_set(&pService->szQueuepausecommand, "");
string_set(&pService->szQueueresumecommand, "");
break;
@ -423,7 +423,7 @@ static void init_printer_values(struct loadparm_service *pService)
string_set(&pService->szQueueresumecommand, "enable %p");
#ifndef HPUX
string_set(&pService->lppausecommand, "lp -i %p-%j -H hold");
string_set(&pService->szLpresumecommand, "lp -i %p-%j -H resume");
string_set(&pService->lpresumecommand, "lp -i %p-%j -H resume");
#endif /* HPUX */
break;
@ -471,7 +471,7 @@ static void init_printer_values(struct loadparm_service *pService)
tmp = talloc_asprintf(tmp_ctx, "vlp %s lpresume %%p %%j",
tdbfile);
string_set(&pService->szLpresumecommand,
string_set(&pService->lpresumecommand,
tmp ? tmp : "vlp lpresume %p %j");
tmp = talloc_asprintf(tmp_ctx, "vlp %s queuepause %%p",