[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  4a55047... spoolss: disable GetPrinterDriver level 101 (as called by XP).
      from  5c4fff6... s3-docs: fix eventlogadm manpage typo.

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


- Log -----------------------------------------------------------------
commit 4a55047465029f302c92c7490aeebc1daa7b4e85
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 15 11:34:17 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
    
    Fix bug #7136 (spoolss getprinterdriver2 level 101 marshalling bad).

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

Summary of changes:
 source3/rpc_server/srv_spoolss_nt.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 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;


-- 
Samba Shared Repository