The Samba-Bugzilla – Attachment 12648 Details for
Bug 12183
Cannot print on CUPS printers with umlauts in name
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 4.5
0001-s3-printing-Correctly-encode-CUPS-printer-URIs.patch (text/plain), 8.39 KB, created by
Andreas Schneider
on 2016-11-11 08:40:25 UTC
(
hide
)
Description:
patch for 4.5
Filename:
MIME Type:
Creator:
Andreas Schneider
Created:
2016-11-11 08:40:25 UTC
Size:
8.39 KB
patch
obsolete
>From 087f0bfd58170bb80dd25d3e04ad7a7b44662d02 Mon Sep 17 00:00:00 2001 >From: Andreas Schneider <asn@samba.org> >Date: Wed, 9 Nov 2016 19:05:49 +0100 >Subject: [PATCH] s3-printing: Correctly encode CUPS printer URIs > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=12183 > >Signed-off-by: Andreas Schneider <asn@samba.org> >Reviewed-by: Jeremy Allison <jra@samba.org> > >(cherry picked from commit c160ae9afb222466c50ae170447a6a0805f7169f) >--- > source3/printing/print_cups.c | 128 ++++++++++++++++++++++++++++++++++++------ > 1 file changed, 110 insertions(+), 18 deletions(-) > >diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c >index 756d67a..673a150 100644 >--- a/source3/printing/print_cups.c >+++ b/source3/printing/print_cups.c >@@ -615,7 +615,8 @@ static int cups_job_delete(const char *sharename, const char *lprm_command, stru > *response = NULL; /* IPP Response */ > cups_lang_t *language = NULL; /* Default language */ > char *user = NULL; >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > size_t size; > > DEBUG(5,("cups_job_delete(%s, %p (%d))\n", sharename, pjob, pjob->sysjob)); >@@ -657,7 +658,18 @@ static int cups_job_delete(const char *sharename, const char *lprm_command, stru > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, > "attributes-natural-language", NULL, language->language); > >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/jobs/%d", pjob->sysjob); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/jobs/%d", >+ pjob->sysjob); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri); > >@@ -712,7 +724,8 @@ static int cups_job_pause(int snum, struct printjob *pjob) > *response = NULL; /* IPP Response */ > cups_lang_t *language = NULL; /* Default language */ > char *user = NULL; >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > size_t size; > > DEBUG(5,("cups_job_pause(%d, %p (%d))\n", snum, pjob, pjob->sysjob)); >@@ -754,7 +767,18 @@ static int cups_job_pause(int snum, struct printjob *pjob) > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, > "attributes-natural-language", NULL, language->language); > >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/jobs/%d", pjob->sysjob); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/jobs/%d", >+ pjob->sysjob); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri); > >@@ -808,7 +832,8 @@ static int cups_job_resume(int snum, struct printjob *pjob) > *response = NULL; /* IPP Response */ > cups_lang_t *language = NULL; /* Default language */ > char *user = NULL; >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > size_t size; > > DEBUG(5,("cups_job_resume(%d, %p (%d))\n", snum, pjob, pjob->sysjob)); >@@ -850,7 +875,18 @@ static int cups_job_resume(int snum, struct printjob *pjob) > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, > "attributes-natural-language", NULL, language->language); > >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/jobs/%d", pjob->sysjob); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/jobs/%d", >+ pjob->sysjob); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri); > >@@ -906,7 +942,8 @@ static int cups_job_submit(int snum, struct printjob *pjob, > *response = NULL; /* IPP Response */ > ipp_attribute_t *attr_job_id = NULL; /* IPP Attribute "job-id" */ > cups_lang_t *language = NULL; /* Default language */ >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > char *new_jobname = NULL; > int num_options = 0; > cups_option_t *options = NULL; >@@ -962,8 +999,18 @@ static int cups_job_submit(int snum, struct printjob *pjob, > &size)) { > goto out; > } >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s", >- printername); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/printers/%s", >+ printername); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, > "printer-uri", NULL, uri); >@@ -1010,7 +1057,18 @@ static int cups_job_submit(int snum, struct printjob *pjob, > * Do the request and get back a response... > */ > >- slprintf(uri, sizeof(uri) - 1, "/printers/%s", printername); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/printers/%s", >+ printername); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > if (!push_utf8_talloc(frame, &filename, pjob->filename, &size)) { > goto out; >@@ -1072,7 +1130,8 @@ static int cups_queue_get(const char *sharename, > *response = NULL; /* IPP Response */ > ipp_attribute_t *attr = NULL; /* Current attribute */ > cups_lang_t *language = NULL; /* Default language */ >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > int qcount = 0, /* Number of active queue entries */ > qalloc = 0; /* Number of queue entries allocated */ > print_queue_struct *queue = NULL, /* Queue entries */ >@@ -1132,7 +1191,18 @@ static int cups_queue_get(const char *sharename, > * Generate the printer URI... > */ > >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s", printername); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/printers/%s", >+ printername); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > /* > * Build an IPP_GET_JOBS request, which requires the following >@@ -1415,7 +1485,8 @@ static int cups_queue_pause(int snum) > cups_lang_t *language = NULL; /* Default language */ > char *printername = NULL; > char *username = NULL; >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > size_t size; > > DEBUG(5,("cups_queue_pause(%d)\n", snum)); >@@ -1461,8 +1532,18 @@ static int cups_queue_pause(int snum) > lp_printername(talloc_tos(), snum), &size)) { > goto out; > } >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s", >- printername); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/printers/%s", >+ printername); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); > >@@ -1519,7 +1600,8 @@ static int cups_queue_resume(int snum) > cups_lang_t *language = NULL; /* Default language */ > char *printername = NULL; > char *username = NULL; >- char uri[HTTP_MAX_URI]; /* printer-uri attribute */ >+ char uri[HTTP_MAX_URI] = {0}; /* printer-uri attribute */ >+ http_uri_status_t ustatus; > size_t size; > > DEBUG(5,("cups_queue_resume(%d)\n", snum)); >@@ -1565,8 +1647,18 @@ static int cups_queue_resume(int snum) > &size)) { > goto out; > } >- slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s", >- printername); >+ ustatus = httpAssembleURIf(HTTP_URI_CODING_ALL, >+ uri, >+ sizeof(uri), >+ "ipp", >+ NULL, /* username */ >+ "localhost", >+ ippPort(), >+ "/printers/%s", >+ printername); >+ if (ustatus != HTTP_URI_STATUS_OK) { >+ goto out; >+ } > > ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); > >-- >2.10.2 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=12648">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Flags:
jra
:
review+
Actions:
View
Attachments on
bug 12183
: 12648 |
12649
|
12720
|
12727