sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

param: Rename variable used for lp_lpqcommand szLpqcommand

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:22 +13:00 committed by Jeremy Allison
parent 042a1bf8fe
commit 8989309382
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -57,7 +57,7 @@ FN_LOCAL_LIST(invalid_users, invalid_users)
FN_LOCAL_LIST(valid_users, valid_users)
FN_LOCAL_LIST(admin_users, admin_users)
FN_LOCAL_STRING(printcommand, printcommand)
FN_LOCAL_STRING(lpqcommand, szLpqcommand)
FN_LOCAL_STRING(lpqcommand, lpqcommand)
FN_LOCAL_STRING(lprmcommand, szLprmcommand)
FN_LOCAL_STRING(lppausecommand, szLppausecommand)
FN_LOCAL_STRING(lpresumecommand, szLpresumecommand)

2
lib/param/param_table.c
View File

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

14
source3/param/loadparm.c
View File

@ -159,7 +159,7 @@ static struct loadparm_service sDefault =
.rootpostexec = NULL,
.szCupsOptions = NULL,
.printcommand = NULL,
.szLpqcommand = NULL,
.lpqcommand = NULL,
.szLprmcommand = NULL,
.szLppausecommand = NULL,
.szLpresumecommand = NULL,
@ -385,14 +385,14 @@ static void init_printer_values(struct loadparm_service *pService)
case PRINT_AIX:
case PRINT_LPRNT:
case PRINT_LPROS2:
string_set(&pService->szLpqcommand, "lpq -P'%p'");
string_set(&pService->lpqcommand, "lpq -P'%p'");
string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
string_set(&pService->printcommand, "lpr -r -P'%p' %s");
break;
case PRINT_LPRNG:
case PRINT_PLP:
string_set(&pService->szLpqcommand, "lpq -P'%p'");
string_set(&pService->lpqcommand, "lpq -P'%p'");
string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
string_set(&pService->printcommand, "lpr -r -P'%p' %s");
string_set(&pService->szQueuepausecommand, "lpc stop '%p'");
@ -405,7 +405,7 @@ static void init_printer_values(struct loadparm_service *pService)
case PRINT_IPRINT:
/* set the lpq command to contain the destination printer
name only. This is used by cups_queue_get() */
string_set(&pService->szLpqcommand, "%p");
string_set(&pService->lpqcommand, "%p");
string_set(&pService->szLprmcommand, "");
string_set(&pService->printcommand, "");
string_set(&pService->szLppausecommand, "");
@ -416,7 +416,7 @@ static void init_printer_values(struct loadparm_service *pService)
case PRINT_SYSV:
case PRINT_HPUX:
string_set(&pService->szLpqcommand, "lpstat -o%p");
string_set(&pService->lpqcommand, "lpstat -o%p");
string_set(&pService->szLprmcommand, "cancel %p-%j");
string_set(&pService->printcommand, "lp -c -d%p %s; rm %s");
string_set(&pService->szQueuepausecommand, "disable %p");
@ -428,7 +428,7 @@ static void init_printer_values(struct loadparm_service *pService)
break;
case PRINT_QNX:
string_set(&pService->szLpqcommand, "lpq -P%p");
string_set(&pService->lpqcommand, "lpq -P%p");
string_set(&pService->szLprmcommand, "lprm -P%p %j");
string_set(&pService->printcommand, "lp -r -P%p %s");
break;
@ -456,7 +456,7 @@ static void init_printer_values(struct loadparm_service *pService)
tmp = talloc_asprintf(tmp_ctx, "vlp %s lpq %%p",
tdbfile);
string_set(&pService->szLpqcommand,
string_set(&pService->lpqcommand,
tmp ? tmp : "vlp lpq %p");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j",