[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  a6bd7f3 s3-printing: fix crash in printer_list_set_printer()
      from  9e25361 tevent_signal: Fix a valgrind error

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


- Log -----------------------------------------------------------------
commit a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c
Author: David Disseldorp <ddiss at samba.org>
Date:   Wed Feb 15 16:30:27 2012 +0100

    s3-printing: fix crash in printer_list_set_printer()
    
    The printer list database format was recently changed to accommodate for
    the printcap location field.
    One of the tdb_pack calls is not provided with a location string
    argument, this causes a crash on some platforms.
    
    https://bugzilla.samba.org/show_bug.cgi?id=8762
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Signed-off-by: Jim McDonough <jmcd at samba.org>
    Signed-off-by: Lars Müller <lars at samba.org>
    
    Autobuild-User: David Disseldorp <ddiss at samba.org>
    Autobuild-Date: Wed Feb 15 19:34:38 CET 2012 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c
index d9e8737..7079ddc 100644
--- a/source3/printing/printer_list.c
+++ b/source3/printing/printer_list.c
@@ -191,7 +191,7 @@ NTSTATUS printer_list_set_printer(TALLOC_CTX *mem_ctx,
 	data.dsize = len;
 
 	len = tdb_pack(data.dptr, data.dsize,
-		       PL_DATA_FORMAT, time_h, time_l, name, str);
+		       PL_DATA_FORMAT, time_h, time_l, name, str, str2);
 
 	status = dbwrap_store_bystring_upper(db, key, data, TDB_REPLACE);
 


-- 
Samba Shared Repository