sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Updated defaults for CUPS printing from Michael Sweet.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent 899ca6e832
commit 2e3ec2b4fc
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/param/loadparm.c
View File

@ -1068,7 +1068,6 @@ static void init_printer_values(void)
break;
case PRINT_CUPS:
string_set(&Globals.szPrintcapname, "cups");
#ifdef HAVE_LIBCUPS
string_set(&sDefault.szLpqcommand, "");
string_set(&sDefault.szLprmcommand, "");
@ -1077,12 +1076,24 @@ static void init_printer_values(void)
string_set(&sDefault.szLpresumecommand, "");
string_set(&sDefault.szQueuepausecommand, "");
string_set(&sDefault.szQueueresumecommand, "");
string_set(&Globals.szPrintcapname, "cups");
#else
string_set(&sDefault.szLpqcommand, "/usr/bin/lpstat -o%p");
string_set(&sDefault.szLprmcommand, "/usr/bin/cancel %p-%j");
string_set(&sDefault.szPrintcommand, "/usr/bin/lp -d%p -oraw %s; rm %s");
string_set(&sDefault.szQueuepausecommand, "/usr/bin/disable %p");
string_set(&sDefault.szQueueresumecommand, "/usr/bin/enable %p");
string_set(&sDefault.szLpqcommand,
"/usr/bin/lpstat -o %p");
string_set(&sDefault.szLprmcommand,
"/usr/bin/cancel %p-%j");
string_set(&sDefault.szPrintcommand,
"/usr/bin/lp -d %p %s; rm %s");
string_set(&sDefault.szLppausecommand,
"lp -i %p-%j -H hold");
string_set(&sDefault.szLpresumecommand,
"lp -i %p-%j -H resume");
string_set(&sDefault.szQueuepausecommand,
"/usr/bin/disable %p");
string_set(&sDefault.szQueueresumecommand,
"/usr/bin/enable %p");
string_set(&Globals.szPrintcapname, "lpstat");
#endif /* HAVE_LIBCUPS */
break;