[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  fc32055 s3-dbwrap_ctdb: fix the build.
       via  a0cbe46 s3-groupdb: split out groupdb/mapping_tdb.h.
      from  031519c selftest: Fix plugin_s4_dc configuration.

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


- Log -----------------------------------------------------------------
commit fc320551d84508371ab1c082752515d538648f49
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 12 11:48:55 2011 +0200

    s3-dbwrap_ctdb: fix the build.
    
    Michael, please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Oct 12 15:25:56 CEST 2011 on sn-devel-104

commit a0cbe469bca5635f001b0f7b2e7e9d58775ff81f
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 12 11:17:57 2011 +0200

    s3-groupdb: split out groupdb/mapping_tdb.h.
    
    Guenther

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

Summary of changes:
 source3/groupdb/mapping.c                          |    1 +
 source3/groupdb/mapping_tdb.c                      |    1 +
 .../mapping_tdb.h}                                 |   16 ++++++++++------
 source3/groupdb/proto.h                            |    4 ----
 source3/lib/dbwrap/dbwrap_ctdb.c                   |    5 ++++-
 5 files changed, 16 insertions(+), 11 deletions(-)
 copy source3/{printing/nt_printing_migrate_internal.h => groupdb/mapping_tdb.h} (62%)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index e9a6c3b..907d40f 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -27,6 +27,7 @@
 #include "../libcli/security/security.h"
 #include "lib/winbind_util.h"
 #include "tdb_compat.h"
+#include "groupdb/mapping_tdb.h"
 
 static const struct mapping_backend *backend;
 
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 447f187..0c4b2fa 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -28,6 +28,7 @@
 #include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 #include "../libcli/security/security.h"
+#include "groupdb/mapping_tdb.h"
 
 static struct db_context *db; /* used for driver files */
 
diff --git a/source3/printing/nt_printing_migrate_internal.h b/source3/groupdb/mapping_tdb.h
similarity index 62%
copy from source3/printing/nt_printing_migrate_internal.h
copy to source3/groupdb/mapping_tdb.h
index dfcf914..86b0ecb 100644
--- a/source3/printing/nt_printing_migrate_internal.h
+++ b/source3/groupdb/mapping_tdb.h
@@ -1,8 +1,10 @@
 /*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
- *
- *  Copyright (c) Andreas Schneider            2010.
+ *  Copyright (C) Andrew Tridgell              1992-2006,
+ *  Copyright (C) Jean François Micouleau      1998-2001.
+ *  Copyright (C) Volker Lendecke              2006.
+ *  Copyright (C) Gerald Carter                2006.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,9 +20,11 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _NT_PRINTING_MIGRATE_INTERNAL_H_
-#define _NT_PRINTING_MIGRATE_INTERNAL_H_
+#ifndef _GROUPDB_MAPPING_TDB_H_
+#define _GROUPDB_MAPPING_TDB_H_
+
+/* The following definitions come from groupdb/mapping_tdb.c  */
 
-bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx);
+const struct mapping_backend *groupdb_tdb_init(void);
 
-#endif /* _NT_PRINTING_MIGRATE_INTERNAL_H_ */
+#endif /* _GROUPDB_MAPPING_TDB_H_ */
diff --git a/source3/groupdb/proto.h b/source3/groupdb/proto.h
index f30584c..ddcdf7a 100644
--- a/source3/groupdb/proto.h
+++ b/source3/groupdb/proto.h
@@ -93,8 +93,4 @@ NTSTATUS pdb_nop_enum_group_mapping(struct pdb_methods *methods,
 					   bool unix_only);
 NTSTATUS pdb_create_builtin_alias(uint32 rid);
 
-/* The following definitions come from groupdb/mapping_tdb.c  */
-
-const struct mapping_backend *groupdb_tdb_init(void);
-
 #endif /* _GROUPDB_PROTO_H_ */
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 85ae5c1..ca43dc1 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -22,6 +22,8 @@
 #include "system/filesys.h"
 #include "lib/util/tdb_wrap.h"
 #include "util_tdb.h"
+#include "dbwrap/dbwrap_rbt.h"
+
 #ifdef CLUSTER_SUPPORT
 
 /*
@@ -1313,7 +1315,8 @@ static int db_ctdb_traverse(struct db_context *db,
 			}
 			status = dbwrap_traverse(newkeys,
 						 traverse_persistent_callback_dbwrap,
-						 &state);
+						 &state,
+						 NULL);
 			ret = NT_STATUS_IS_OK(status) ? 0 : -1;
 			talloc_free(newkeys);
 		}


-- 
Samba Shared Repository