[Pkg-samba-maint] [samba] 91/135: spoolss: accept XPS_PASS datatype used by Windows 8

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit e99d701806156b2343d3a96a6a320a625e8e8ec0
Author: Arvid Requate <requate at univention.de>
Date:   Thu Nov 21 12:35:20 2013 +0100

    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 at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit b2815b4c8c3e436a79fb7f07be285a417fd6e8cb)
    
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Fri Nov 22 13:44:05 CET 2013 on sn-devel-104
---
 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 4814e04..b13f8b0 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -5781,7 +5781,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;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git