[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  ddbda92... spoolss: disable GetPrinterDriver level 101 (as called by XP).
      from  72f250a... s4-smbtorture: add some security descriptor tests to RPC-SPOOLSS and RPC-SPOOLSS-PRINTER.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ddbda92f87aeedb1a1a976a43a1e5ada3897646e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 11 12:54:57 2010 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 5f431c6..34daf40 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4842,6 +4842,8 @@ static WERROR fill_printer_driver_info8(TALLOC_CTX *mem_ctx,
 
 	return WERR_OK;
 }
+
+#if 0 /* disabled until marshalling issues are resolved - gd */
 /********************************************************************
  ********************************************************************/
 
@@ -4960,7 +4962,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,
@@ -5015,7 +5017,7 @@ static WERROR fill_printer_driver_info101(TALLOC_CTX *mem_ctx,
 
 	return WERR_OK;
 }
-
+#endif
 /********************************************************************
  ********************************************************************/
 
@@ -5090,9 +5092,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;


-- 
Samba Shared Repository