summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-03-16 19:10:55 +0000
committerJeremy Allison <jra@samba.org>2001-03-16 19:10:55 +0000
commitdfcfdf72507ec627e68a7e4e771f2bdc0fa29830 (patch)
tree0d1ad87333516552fd36e0737289786637d0ab2e
parent096550d86cfa7e73bd819417c5721c88c35999c5 (diff)
downloadsamba-dfcfdf72507ec627e68a7e4e771f2bdc0fa29830.tar.gz
samba-dfcfdf72507ec627e68a7e4e771f2bdc0fa29830.tar.bz2
samba-dfcfdf72507ec627e68a7e4e771f2bdc0fa29830.zip
Updated defaults for CUPS printing from Michael Sweet.
Jeremy. (This used to be commit 2e3ec2b4fc02f3acb47a67ebd000b99a918a9967)
-rw-r--r--source3/param/loadparm.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index aebf43c9a5..64393b4082 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -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;