From: Gerald Carter <jerry@samba.org>
Date: Tue, 8 Mar 2005 21:04:36 +0000 (+0000)
Subject: r5696: BUG 2355: use bsd style commands for 'printing = cups' but \!defined(HAVE_CUPS)
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5216728d82fcbdcba9a06f9730806ef4a4d6108f;p=thirdparty%2Fsamba.git

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 21abafb5783..d86f4b391a2 100644
--- 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'");