summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-02-12 14:41:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:39 -0500
commitf9a28748cfa89d020249ca24d8fcbab1a2bdd4f5 (patch)
tree42dabc581b70531bcb94fc3fda70d1201c4b90fd /source3/param
parent70be7d71924d8ae23837c7555d65f12a0dfaa284 (diff)
downloadsamba-f9a28748cfa89d020249ca24d8fcbab1a2bdd4f5.tar.gz
samba-f9a28748cfa89d020249ca24d8fcbab1a2bdd4f5.tar.bz2
samba-f9a28748cfa89d020249ca24d8fcbab1a2bdd4f5.zip
r5359: BUG 2333: use the lpq command to pass in the correct printer name for cups_queue_get(). See comments in code for details
(This used to be commit 3eee00e0d0e9b58cdd35209691072b625813681c)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 45245e2cfe..80843eda82 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1226,7 +1226,9 @@ static void init_printer_values(service *pService)
case PRINT_CUPS:
#ifdef HAVE_CUPS
- string_set(&pService->szLpqcommand, "");
+ /* set the lpq command to contain the destination printer
+ name only. This is used by cups_queue_get() */
+ string_set(&pService->szLpqcommand, "%p");
string_set(&pService->szLprmcommand, "");
string_set(&pService->szPrintcommand, "");
string_set(&pService->szLppausecommand, "");