Attachment 257131 Details for Bug 380591 – samba-cups-utf8.patch

[patch] samba-cups-utf8.patch

samba-cups-utf8.patch (text/plain), 12.19 KB, created by Tim Waugh on 2007-11-13 17:48:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Waugh

Created: 2007-11-13 17:48:01 UTC

Size: 12.19 KB

patch

obsolete

>diff -up samba-3.0.26a/source/printing/print_cups.c.cups-utf8 samba-3.0.26a/source/printing/print_cups.c
>--- samba-3.0.26a/source/printing/print_cups.c.cups-utf8	2007-11-13 16:15:47.000000000 +0000
>+++ samba-3.0.26a/source/printing/print_cups.c	2007-11-13 16:25:40.000000000 +0000
>@@ -23,7 +23,6 @@
> 
> #ifdef HAVE_CUPS
> #include <cups/cups.h>
>-#include <cups/language.h>
> 
> extern userdom_struct current_user_info;
> 
>@@ -81,7 +80,6 @@ BOOL cups_cache_reload(void)
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
> 	ipp_attribute_t	*attr;		/* Current attribute */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		*name,		/* printer-name attribute */
> 			*info;		/* printer-info attribute */
> 	static const char *requested[] =/* Requested attributes */
>@@ -116,18 +114,7 @@ BOOL cups_cache_reload(void)
> 	*    requested-attributes
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = CUPS_GET_PRINTERS;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-                     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-                     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(CUPS_GET_PRINTERS);
> 
>         ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
> 	              "requested-attributes",
>@@ -198,16 +185,7 @@ BOOL cups_cache_reload(void)
> 	*    requested-attributes
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = CUPS_GET_CLASSES;
>-	request->request.op.request_id   = 1;
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-                     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-                     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(CUPS_GET_CLASSES);
> 
>         ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
> 	              "requested-attributes",
>@@ -272,9 +250,6 @@ BOOL cups_cache_reload(void)
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -292,7 +267,6 @@ static int cups_job_delete(const char *s
> 	http_t		*http = NULL;		/* HTTP connection to server */
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
> 
> 
>@@ -322,18 +296,7 @@ static int cups_job_delete(const char *s
> 	*    requesting-user-name
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_CANCEL_JOB;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-        	     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-        	     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_CANCEL_JOB);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://localhost/jobs/%d", pjob->sysjob);
> 
>@@ -362,9 +325,6 @@ static int cups_job_delete(const char *s
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -382,7 +342,6 @@ static int cups_job_pause(int snum, stru
> 	http_t		*http = NULL;		/* HTTP connection to server */
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
> 
> 
>@@ -412,18 +371,7 @@ static int cups_job_pause(int snum, stru
> 	*    requesting-user-name
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_HOLD_JOB;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-        	     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-        	     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_HOLD_JOB);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://localhost/jobs/%d", pjob->sysjob);
> 
>@@ -452,9 +400,6 @@ static int cups_job_pause(int snum, stru
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -472,7 +417,6 @@ static int cups_job_resume(int snum, str
> 	http_t		*http = NULL;		/* HTTP connection to server */
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
> 
> 
>@@ -502,18 +446,7 @@ static int cups_job_resume(int snum, str
> 	*    requesting-user-name
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_RELEASE_JOB;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-        	     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-        	     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_RELEASE_JOB);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://localhost/jobs/%d", pjob->sysjob);
> 
>@@ -542,9 +475,6 @@ static int cups_job_resume(int snum, str
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -562,7 +492,6 @@ static int cups_job_submit(int snum, str
> 	http_t		*http = NULL;		/* HTTP connection to server */
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
> 	char 		*clientname = NULL; 	/* hostname of client for job-originating-host attribute */
> 	pstring		new_jobname;
>@@ -596,18 +525,7 @@ static int cups_job_submit(int snum, str
> 	*    [document-data]
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_PRINT_JOB;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-        	     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-        	     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_PRINT_JOB);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s",
> 	         PRINTERNAME(snum));
>@@ -670,9 +588,6 @@ static int cups_job_submit(int snum, str
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -694,7 +609,6 @@ static int cups_queue_get(const char *sh
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*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 */
> 	int		qcount = 0,		/* Number of active queue entries */
> 			qalloc = 0;		/* Number of queue entries allocated */
>@@ -765,18 +679,7 @@ static int cups_queue_get(const char *sh
> 	*    printer-uri
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_GET_JOBS;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-                     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-                     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_GET_JOBS);
> 
>         ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
> 	              "requested-attributes",
>@@ -929,16 +832,7 @@ static int cups_queue_get(const char *sh
> 	*    printer-uri
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
>-	request->request.op.request_id   = 1;
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-                     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-                     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
> 
>         ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
> 	              "requested-attributes",
>@@ -991,9 +885,6 @@ static int cups_queue_get(const char *sh
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -1011,7 +902,6 @@ static int cups_queue_pause(int snum)
> 	http_t		*http = NULL;		/* HTTP connection to server */
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
> 
> 
>@@ -1041,18 +931,7 @@ static int cups_queue_pause(int snum)
> 	 *    requesting-user-name
> 	 */
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_PAUSE_PRINTER;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-        	     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-        	     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_PAUSE_PRINTER);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s",
> 	         PRINTERNAME(snum));
>@@ -1082,9 +961,6 @@ static int cups_queue_pause(int snum)
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -1102,7 +978,6 @@ static int cups_queue_resume(int snum)
> 	http_t		*http = NULL;		/* HTTP connection to server */
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		uri[HTTP_MAX_URI]; /* printer-uri attribute */
> 
> 
>@@ -1132,18 +1007,7 @@ static int cups_queue_resume(int snum)
> 	*    requesting-user-name
> 	*/
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_RESUME_PRINTER;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-        	     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-        	     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_RESUME_PRINTER);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://localhost/printers/%s",
> 	         PRINTERNAME(snum));
>@@ -1173,9 +1037,6 @@ static int cups_queue_resume(int snum)
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
> 
>@@ -1204,7 +1065,6 @@ BOOL cups_pull_comment_location(NT_PRINT
> 	ipp_t		*request = NULL,	/* IPP Request */
> 			*response = NULL;	/* IPP Response */
> 	ipp_attribute_t	*attr;		/* Current attribute */
>-	cups_lang_t	*language = NULL;	/* Default language */
> 	char		*name,		/* printer-name attribute */
> 			*info,		/* printer-info attribute */
> 			*location;	/* printer-location attribute */
>@@ -1233,18 +1093,7 @@ BOOL cups_pull_comment_location(NT_PRINT
> 		goto out;
> 	}
> 
>-	request = ippNew();
>-
>-	request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
>-	request->request.op.request_id   = 1;
>-
>-	language = cupsLangDefault();
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
>-                     "attributes-charset", NULL, cupsLangEncoding(language));
>-
>-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
>-                     "attributes-natural-language", NULL, language->language);
>+	request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
> 
> 	slprintf(uri, sizeof(uri) - 1, "ipp://%s/printers/%s",
> 		 lp_cups_server(), printer->sharename);
>@@ -1325,9 +1174,6 @@ BOOL cups_pull_comment_location(NT_PRINT
> 	if (response)
> 		ippDelete(response);
> 
>-	if (language)
>-		cupsLangFree(language);
>-
> 	if (http)
> 		httpClose(http);
>

Actions: View | Diff

Attachments on bug 380591: 257131 | 292389