summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-08 21:04:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:55 -0500
commit26462d905d63519ddbb551fc56f2b70da0a2167d (patch)
treec0e42d3517ead265cc006fde38523c3e9090ea59 /source3/param
parent13b9edc9a7570b0c337e63fdf4304f39021d52da (diff)
downloadsamba-26462d905d63519ddbb551fc56f2b70da0a2167d.tar.gz
samba-26462d905d63519ddbb551fc56f2b70da0a2167d.tar.bz2
samba-26462d905d63519ddbb551fc56f2b70da0a2167d.zip
r5696: BUG 2355: use bsd style commands for 'printing = cups' but \!defined(HAVE_CUPS)
(This used to be commit 5216728d82fcbdcba9a06f9730806ef4a4d6108f)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 21abafb578..d86f4b391a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1239,9 +1239,9 @@ static void init_printer_values(service *pService)
string_set(&pService->szQueuepausecommand, "");
string_set(&pService->szQueueresumecommand, "");
#else
- string_set(&pService->szLpqcommand, "/usr/bin/lpstat -o '%p'");
- string_set(&pService->szLprmcommand, "/usr/bin/cancel '%p-%j'");
- string_set(&pService->szPrintcommand, "/usr/bin/lp -d '%p' %s; rm %s");
+ string_set(&pService->szLpqcommand, "/usr/bin/lpq -P'%p'");
+ string_set(&pService->szLprmcommand, "/usr/bin/lprm -P'%p' %j");
+ string_set(&pService->szPrintcommand, "/usr/bin/lpr -P'%p' %s; rm %s");
string_set(&pService->szLppausecommand, "lp -i '%p-%j' -H hold");
string_set(&pService->szLpresumecommand, "lp -i '%p-%j' -H resume");
string_set(&pService->szQueuepausecommand, "/usr/bin/disable '%p'");