[SCM] Samba Shared Repository - branch v3-5-stable updated

[Karolin Seeger]

The branch, v3-5-stable has been updated
       via  04b614f... spoolss: disable GetPrinterDriver level 101 (as called 
by XP).
      from  76148be... VERSION: We need another release candidate.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable


- Log -----------------------------------------------------------------
commit 04b614fcc4ee9197ef81a4c45edb7c9edcfbc080
Author: Günther Deschner <g...@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
    (cherry picked from commit ddbda92f87aeedb1a1a976a43a1e5ada3897646e)
    
    Fix bug #7136 (spoolss getprinterdriver2 level 101 marshalling bad).
    (cherry picked from commit 4ad86ab5e79c97c5edbd897c54f66bc2b437d90f)

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

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 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;


-- 
Samba Shared Repository