Attachment 5347 Details for Bug 7136 – patch for 3.5

[patch] patch for 3.5

level101-3-5-test.patch (text/plain), 2.08 KB, created by Guenther Deschner on 2010-02-15 04:28:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2010-02-15 04:28:48 UTC

Size: 2.08 KB

patch

obsolete

>From 39c725660af96be0e5b713018b2bf0224fdeff11 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Thu, 11 Feb 2010 12:54:57 +0100
>Subject: [PATCH] spoolss: disable GetPrinterDriver level 101 (as called by XP).
>
>We still dont get the marshalling right, disable and XP will just fall back to
>level 6.
>
>Guenther
>(cherry picked from commit ddbda92f87aeedb1a1a976a43a1e5ada3897646e)
>---
> source3/rpc_server/srv_spoolss_nt.c |    8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
>index 74f7f93..98de40b 100644
>--- a/source3/rpc_server/srv_spoolss_nt.c
>+++ b/source3/rpc_server/srv_spoolss_nt.c
>@@ -4836,6 +4836,8 @@ static WERROR fill_printer_driver_info8(TALLOC_CTX *mem_ctx,
> 
> 	return WERR_OK;
> }
>+
>+#if 0 /* disabled until marshalling issues are resolved - gd */
> /********************************************************************
>  ********************************************************************/
> 
>@@ -4954,7 +4956,7 @@ static WERROR spoolss_DriverFileInfo_from_driver(TALLOC_CTX *mem_ctx,
> }
> 
> /********************************************************************
>- * fill a spoolss_DriverInfo101 sttruct
>+ * fill a spoolss_DriverInfo101 struct
>  ********************************************************************/
> 
> static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx,
>@@ -5009,7 +5011,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx,
> 
> 	return WERR_OK;
> }
>-
>+#endif
> /********************************************************************
>  ********************************************************************/
> 
>@@ -5084,9 +5086,11 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
> 	case 8:
> 		result = fill_printer_driver_info8(mem_ctx, &r->info8, driver, servername);
> 		break;
>+#if 0 /* disabled until marshalling issues are resolved - gd */
> 	case 101:
> 		result = fill_printer_driver_info101(mem_ctx, &r->info101, driver, servername);
> 		break;
>+#endif
> 	default:
> 		result = WERR_UNKNOWN_LEVEL;
> 		break;
>-- 
>1.6.6
>

Flags:

vl: review+

Actions: View

Attachments on bug 7136: 5347 | 5348