Attachment 5348 Details for Bug 7136 – patch for 3.4

[patch] patch for 3.4

level101-3-4-test.patch (text/plain), 2.85 KB, created by Guenther Deschner on 2010-02-15 04:35:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2010-02-15 04:35:02 UTC

Size: 2.85 KB

patch

obsolete

>From 253777a4ed07e1a635ca87cacb6028254f0e3aca Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Mon, 15 Feb 2010 11:34:17 +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
>---
> source3/rpc_server/srv_spoolss_nt.c |   12 +++++++-----
> 1 files changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
>index 680d9af..d580754 100644
>--- a/source3/rpc_server/srv_spoolss_nt.c
>+++ b/source3/rpc_server/srv_spoolss_nt.c
>@@ -5039,7 +5039,7 @@ static WERROR fill_printer_driver_info6(TALLOC_CTX *mem_ctx,
> 
> /********************************************************************
>  ********************************************************************/
>-
>+#if 0 /* disabled until marshalling issues are resolved - gd */
> static WERROR fill_spoolss_DriverFileInfo(TALLOC_CTX *mem_ctx,
> 					  struct spoolss_DriverFileInfo *r,
> 					  const char *cservername,
>@@ -5155,7 +5155,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,
>@@ -5204,7 +5204,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx,
> 
> 	return WERR_OK;
> }
>-
>+#endif
> /********************************************************************
>  * construct_printer_driver_info_1
>  ********************************************************************/
>@@ -5392,7 +5392,7 @@ static WERROR construct_printer_driver_info_6(TALLOC_CTX *mem_ctx,
> 
> 	return status;
> }
>-
>+#if 0 /* disabled until marshalling issues are resolved - gd */
> /********************************************************************
>  * construct_printer_info_101
>  * fill a printer_info_101 struct
>@@ -5455,7 +5455,7 @@ static WERROR construct_printer_driver_info_101(TALLOC_CTX *mem_ctx,
> 
> 	return result;
> }
>-
>+#endif
> /****************************************************************
>  _spoolss_GetPrinterDriver2
> ****************************************************************/
>@@ -5525,6 +5525,7 @@ WERROR _spoolss_GetPrinterDriver2(pipes_struct *p,
> 							 r->in.architecture,
> 							 r->in.client_major_version);
> 		break;
>+#if 0 /* disabled until marshalling issues are resolved - gd */
> 	case 101:
> 		result = construct_printer_driver_info_101(p->mem_ctx,
> 							   &r->out.info->info101,
>@@ -5533,6 +5534,7 @@ WERROR _spoolss_GetPrinterDriver2(pipes_struct *p,
> 							   r->in.architecture,
> 							   r->in.client_major_version);
> 		break;
>+#endif
> 	default:
> 		result = WERR_UNKNOWN_LEVEL;
> 		break;
>-- 
>1.6.6
>

Flags:

vl: review+

Actions: View

Attachments on bug 7136: 5347 | 5348