[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  84f3eee... s3-registry: fix fill_in_printer_values() for datatype and printprocessor.
      from  1c4c4dd... s4-smbtorture: protect against full UNC paths in winreg printerinfo test.

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


- Log -----------------------------------------------------------------
commit 84f3eeeca312cc9182785bb7c3b0e1c4db8b3480
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 8 16:20:46 2010 +0200

    s3-registry: fix fill_in_printer_values() for datatype and printprocessor.
    
    It is wise and good to enforce RAW and winprint, but we need to be consistent
    with spoolss (and enforce it there).
    
    Found by torture test.
    
    Guenther

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

Summary of changes:
 source3/registry/reg_backend_printing.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 278ad4f..26227b5 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -414,8 +414,8 @@ static void fill_in_printer_values(NT_PRINTER_INFO_LEVEL_2 *info2, struct regval
 	regval_ctr_addvalue_sz(values, "Share Name", info2->sharename);
 	regval_ctr_addvalue_sz(values, "Printer Driver", info2->drivername);
 	regval_ctr_addvalue_sz(values, "Separator File", info2->sepfile);
-	regval_ctr_addvalue_sz(values, "Print Processor", "WinPrint");
-	regval_ctr_addvalue_sz(values, "Datatype", "RAW");
+	regval_ctr_addvalue_sz(values, "Print Processor", info2->printprocessor);
+	regval_ctr_addvalue_sz(values, "Datatype", info2->datatype);
 
 	/* stream the device mode */
 


-- 
Samba Shared Repository