From 26462d905d63519ddbb551fc56f2b70da0a2167d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 8 Mar 2005 21:04:36 +0000 Subject: r5696: BUG 2355: use bsd style commands for 'printing = cups' but \!defined(HAVE_CUPS) (This used to be commit 5216728d82fcbdcba9a06f9730806ef4a4d6108f) --- source3/param/loadparm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3') 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'"); -- cgit