svn commit: samba r5696 - in branches/SAMBA_3_0/source/param: .

jerry at samba.org jerry at samba.org
Tue Mar 8 21:04:36 GMT 2005


Author: jerry
Date: 2005-03-08 21:04:36 +0000 (Tue, 08 Mar 2005)
New Revision: 5696

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5696

Log:
BUG 2355: use bsd style commands for 'printing = cups' but \!defined(HAVE_CUPS)
Modified:
   branches/SAMBA_3_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2005-03-08 19:20:46 UTC (rev 5695)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2005-03-08 21:04:36 UTC (rev 5696)
@@ -1239,9 +1239,9 @@
 			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'");



More information about the samba-cvs mailing list