r5696: BUG 2355: use bsd style commands for 'printing = cups' but \!defined(HAVE_CUPS)

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 21abafb578353e1a7b59ab5bd4d1073b370d2a15..d86f4b391a2a0621a2f02f55b684bfef0a205f60 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/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'");