The Samba-Bugzilla – Attachment 964 Details for
Bug 2333
"printer name" is not honored in printing.c
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch against 3.0.11 to opverload the lpq command to pass in the printername to cups_queue_get()
bug2333.patch (text/plain), 2.74 KB, created by
Gerald (Jerry) Carter (dead mail address)
on 2005-02-12 07:38:36 UTC
(
hide
)
Description:
patch against 3.0.11 to opverload the lpq command to pass in the printername to cups_queue_get()
Filename:
MIME Type:
Creator:
Gerald (Jerry) Carter (dead mail address)
Created:
2005-02-12 07:38:36 UTC
Size:
2.74 KB
patch
obsolete
>Index: printing/print_cups.c >=================================================================== >--- printing/print_cups.c (revision 5358) >+++ printing/print_cups.c (working copy) >@@ -670,12 +670,13 @@ > * 'cups_queue_get()' - Get all the jobs in the print queue. > */ > >-static int cups_queue_get(const char *printer_name, >+static int cups_queue_get(const char *sharename, > enum printing_types printing_type, > char *lpq_command, > print_queue_struct **q, > print_status_struct *status) > { >+ fstring printername; > http_t *http = NULL; /* HTTP connection to server */ > ipp_t *request = NULL, /* IPP Request */ > *response = NULL; /* IPP Response */ >@@ -711,8 +712,16 @@ > > *q = NULL; > >- DEBUG(5,("cups_queue_get(%s, %p, %p)\n", printer_name, q, status)); >+ /* HACK ALERT!!! The porblem with support the 'printer name' >+ option is that we key the tdb off the sharename. So we will >+ overload the lpq_command string to pass in the printername >+ (which is basically what we do for non-cups printers ... using >+ the lpq_command to get the queue listing). */ > >+ fstrcpy( printername, lpq_command ); >+ >+ DEBUG(5,("cups_queue_get(%s, %p, %p)\n", printername, q, status)); >+ > /* > * Make sure we don't ask for passwords... > */ >@@ -733,7 +742,7 @@ > * Generate the printer URI... > */ > >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s", printer_name); >+ slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s", printername); > > /* > * Build an IPP_GET_JOBS request, which requires the following >@@ -936,14 +945,14 @@ > */ > > if ((response = cupsDoRequest(http, request, "/")) == NULL) { >- DEBUG(0,("Unable to get printer status for %s - %s\n", printer_name, >+ DEBUG(0,("Unable to get printer status for %s - %s\n", printername, > ippErrorString(cupsLastError()))); > *q = queue; > goto out; > } > > if (response->request.status.status_code >= IPP_OK_CONFLICT) { >- DEBUG(0,("Unable to get printer status for %s - %s\n", printer_name, >+ DEBUG(0,("Unable to get printer status for %s - %s\n", printername, > ippErrorString(response->request.status.status_code))); > *q = queue; > goto out; >Index: param/loadparm.c >=================================================================== >--- param/loadparm.c (revision 5358) >+++ param/loadparm.c (working copy) >@@ -1226,7 +1226,9 @@ > > 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, "");
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 2333
: 964