[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  158d41b... s4-smbtorture: make sure to zero the add driver info 8 struct before adding drivers.
       via  7532640... s3-spoolss: publish "Monitor" in winreg for drivers.
       via  70ec7e0... s3-spoolss: fix winreg attribute for storing datatype.
      from  03a9ac4... s3-spoolss: fix some uninitialized variables.

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


- Log -----------------------------------------------------------------
commit 158d41b6b4264e7ece93cf77a15e70ccbf8673b8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 27 17:52:47 2010 +0200

    s4-smbtorture: make sure to zero the add driver info 8 struct before adding drivers.
    
    Guenther

commit 7532640a74bbdd3c815e29732785350e9622925e
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 27 17:32:34 2010 +0200

    s3-spoolss: publish "Monitor" in winreg for drivers.
    
    Found by torture test.
    
    Guenther

commit 70ec7e07001d0308cb3902b13378a1ef61b2acb9
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 27 16:48:29 2010 +0200

    s3-spoolss: fix winreg attribute for storing datatype.
    
    Found by torture test (and checked with w2k, w2k3 and w2k8).
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 7383ce6..e90c708 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -905,7 +905,8 @@ static void fill_in_driver_values(const struct spoolss_DriverInfo8 *r,
 	filename = dos_basename(r->help_file);
 	regval_ctr_addvalue_sz(values, "Help File", filename);
 
-	regval_ctr_addvalue_sz(values, "Data Type", r->default_datatype);
+	regval_ctr_addvalue_sz(values, "Datatype", r->default_datatype);
+	regval_ctr_addvalue_sz(values, "Monitor", r->monitor_name);
 
 	regval_ctr_addvalue( values, "Version", REG_DWORD, (char*)&r->version,
 		sizeof(r->version) );
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index a0adff3..7d0038e 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -7547,6 +7547,8 @@ static bool test_add_driver_arg(struct torture_context *tctx,
 	uint32_t add_flags = APD_COPY_NEW_FILES;
 	uint32_t delete_flags = 0;
 
+	ZERO_STRUCT(info8);
+
 	torture_comment(tctx, "Testing PrinterDriver%s '%s' for environment '%s'\n",
 		d->ex ? "Ex" : "", d->info8.driver_name, d->local.environment);
 


-- 
Samba Shared Repository