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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  43f9e74 s3-printing: fix crash in printer_list_set_printer()
      from  fa17a55 s3:dbwrap_ctdb: return the number of records in db_ctdb_traverse() for persistent dbs

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


- Log -----------------------------------------------------------------
commit 43f9e7400a106cd70d12cf50e84a552f3f75a294
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

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

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 d28278d..6ddd774 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