[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  1e24997 s3: Avoid a crash with debug level 10
      from  40a4aea ldb: Permit desactivation of autocomit for every ldb_xxx_ctrl function

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


- Log -----------------------------------------------------------------
commit 1e24997e3e4bc04395d6ecf470faedb632b6ec68
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 30 15:15:29 2012 +0200

    s3: Avoid a crash with debug level 10
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Fri Mar 30 16:52:16 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/lib/dbwrap/dbwrap_ctdb.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 41adfd8..41d9f19 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1104,7 +1104,8 @@ again:
 			   ctdb_data.dptr, ctdb_data.dptr ?
 			   ((struct ctdb_ltdb_header *)ctdb_data.dptr)->dmaster : -1,
 			   get_my_vnn(),
-			   ((struct ctdb_ltdb_header *)ctdb_data.dptr)->flags));
+			   ctdb_data.dptr ?
+			   ((struct ctdb_ltdb_header *)ctdb_data.dptr)->flags : 0));
 
 		status = ctdbd_migrate(messaging_ctdbd_connection(), ctx->db_id,
 				       key);


-- 
Samba Shared Repository