Attachment 8466 Details for Bug 9474 – patch for 3.6.x

[patch] patch for 3.6.x

v3-6-test.patch (text/plain), 2.93 KB, created by Guenther Deschner on 2013-01-22 11:46:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2013-01-22 11:46:24 UTC

Size: 2.93 KB

patch

obsolete

>From 8eea764bdd240eb2948b257c2e554f88966eeb28 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Mon, 7 Jan 2013 15:14:30 +0100
>Subject: [PATCH 1/2] spoolss: add SPOOLSS_DRIVER_VERSION_2012 (4) define to
> IDL.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Guenther
>
>Signed-off-by: GÃ¼nther Deschner <gd@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 638ed90620e3c6a35ef56a11c612c13d6b7d6ff5)
>---
> librpc/idl/spoolss.idl | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
>index d888a79..4f706e2 100644
>--- a/librpc/idl/spoolss.idl
>+++ b/librpc/idl/spoolss.idl
>@@ -1303,7 +1303,8 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
> 		SPOOLSS_DRIVER_VERSION_9X	= 0,
> 		SPOOLSS_DRIVER_VERSION_NT35	= 1,
> 		SPOOLSS_DRIVER_VERSION_NT4	= 2,
>-		SPOOLSS_DRIVER_VERSION_200X	= 3
>+		SPOOLSS_DRIVER_VERSION_200X	= 3,
>+		SPOOLSS_DRIVER_VERSION_2012	= 4
> 	} spoolss_DriverOSVersion;
> 
> 	typedef struct {
>-- 
>1.8.1
>
>
>From 96a942cc9ff071b00ff4749241b685851a1e0b35 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Fri, 18 Jan 2013 00:22:31 +0100
>Subject: [PATCH 2/2] BUG 9474: Downgrade v4 printer driver requests to v3.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Guenther
>
>Signed-off-by: GÃ¼nther Deschner <gd@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Mon Jan 21 16:11:02 CET 2013 on sn-devel-104
>(cherry picked from commit 58fadf2f48a2a409b4ee98fdc0166c7f801a7629)
>---
> source3/rpc_server/spoolss/srv_spoolss_nt.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
>index a5579c2..c511fd0 100644
>--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
>+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
>@@ -5609,6 +5609,7 @@ WERROR _spoolss_GetPrinterDriver2(struct pipes_struct *p,
> {
> 	struct printer_handle *printer;
> 	WERROR result;
>+	uint32_t version = r->in.client_major_version;
> 
> 	int snum;
> 
>@@ -5633,13 +5634,19 @@ WERROR _spoolss_GetPrinterDriver2(struct pipes_struct *p,
> 		return WERR_BADFID;
> 	}
> 
>+	if (r->in.client_major_version == SPOOLSS_DRIVER_VERSION_2012) {
>+		DEBUG(3,("_spoolss_GetPrinterDriver2: v4 driver requested, "
>+			"downgrading to v3\n"));
>+		version = SPOOLSS_DRIVER_VERSION_200X;
>+	}
>+
> 	result = construct_printer_driver_info_level(p->mem_ctx,
> 						     get_session_info_system(),
> 						     p->msg_ctx,
> 						     r->in.level, r->out.info,
> 						     snum, printer->servername,
> 						     r->in.architecture,
>-						     r->in.client_major_version);
>+						     version);
> 	if (!W_ERROR_IS_OK(result)) {
> 		TALLOC_FREE(r->out.info);
> 		return result;
>-- 
>1.8.1
>

Flags:

asn: review+

Actions: View

Attachments on bug 9474: 8296 | 8297 | 8298 | 8340 | 8449 | 8465 | 8466 | 10123 | 10124