Attachment 9460 Details for Bug 10267 – patch for 3.6, straight cherry-pick from master

[patch] patch for 3.6, straight cherry-pick from master

bso10267_win8_print_36.patch (text/plain), 1.46 KB, created by David Disseldorp on 2013-11-21 14:27:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2013-11-21 14:27:44 UTC

Size: 1.46 KB

patch

obsolete

>From 2ebaf143f4afcd0362c103489d01e27a9f673d4e Mon Sep 17 00:00:00 2001
>From: Arvid Requate <requate@univention.de>
>Date: Thu, 21 Nov 2013 12:35:20 +0100
>Subject: [PATCH] spoolss: accept XPS_PASS datatype used by Windows 8
>
>The new v4 driver model used in Windows 8 declares print jobs
>intended to bypass the XPS processing layer by setting datatype to
>"XPS_PASS" instead of "RAW".
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10267
>
>Reviewed-by: David Disseldorp <ddiss@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit b2815b4c8c3e436a79fb7f07be285a417fd6e8cb)
>---
> source3/rpc_server/spoolss/srv_spoolss_nt.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
>index 2f1f7c4..8372c43 100644
>--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
>+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
>@@ -5769,7 +5769,13 @@ WERROR _spoolss_StartDocPrinter(struct pipes_struct *p,
> 	 */
> 
> 	if (info_1->datatype) {
>-		if (strcmp(info_1->datatype, "RAW") != 0) {
>+		/*
>+		 * The v4 driver model used in Windows 8 declares print jobs
>+		 * intended to bypass the XPS processing layer by setting
>+		 * datatype to "XPS_PASS" instead of "RAW".
>+		 */
>+                if ((strcmp(info_1->datatype, "RAW") != 0)
>+                 && (strcmp(info_1->datatype, "XPS_PASS") != 0)) {
> 			*r->out.job_id = 0;
> 			return WERR_INVALID_DATATYPE;
> 		}
>-- 
>1.8.1.4
>

Flags:

kseeger: review? (gd)
asn: review+

Actions: View

Attachments on bug 10267: 9420 | 9433 | 9458 | 9459 | 9460