[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  d4912ed s3:autoconf-build: build the idmap backends tdb2, rid, and hash by default (shared)
       via  f5b40b1 s3:waf-build: build the idmap backends tdb2, rid, and hash by default (shared)
       via  39b4733 s3:idmap_tdb: fix miss in rename of dbwrap_trans_store_uint32() to dbwrap_trans_store_uint32_bystring()
       via  bb96139 dbwrap: Rename dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring
      from  ad3881b s3:configure: check for SPLICE_F_MOVE at configure stage

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


- Log -----------------------------------------------------------------
commit d4912edea64e79d0f580f6ddacd7a178faeaa5fe
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 18 11:04:43 2012 +0200

    s3:autoconf-build: build the idmap backends tdb2, rid, and hash by default (shared)
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Jun 18 13:38:50 CEST 2012 on sn-devel-104

commit f5b40b1bddf8b32d2ce3e20b53339027239f116e
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 18 10:53:53 2012 +0200

    s3:waf-build: build the idmap backends tdb2, rid, and hash by default (shared)

commit 39b4733073635198cfbb29696fede9a2d4d09873
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 18 10:27:54 2012 +0200

    s3:idmap_tdb: fix miss in rename of dbwrap_trans_store_uint32() to dbwrap_trans_store_uint32_bystring()

commit bb96139846c58b14057a0d5175afc30a16631e5e
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Jun 18 17:07:57 2012 +1000

    dbwrap: Rename dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 source3/configure.in          |    3 +++
 source3/winbindd/idmap_tdb2.c |   12 ++++++------
 source3/wscript               |    3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index e4ce944..e6b1a73 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -466,6 +466,9 @@ default_shared_modules="$default_shared_modules vfs_crossrename"
 default_shared_modules="$default_shared_modules vfs_linux_xfs_sgid"
 default_shared_modules="$default_shared_modules vfs_time_audit"
 default_shared_modules="$default_shared_modules idmap_autorid"
+default_shared_modules="$default_shared_modules idmap_tdb2"
+default_shared_modules="$default_shared_modules idmap_rid"
+default_shared_modules="$default_shared_modules idmap_hash"
 
 if test "x$developer" = xyes; then
    default_shared_modules="$default_shared_modules perfcount_test"
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index bd535c0..4a9c2fe 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -67,10 +67,10 @@ static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
 
 	/* Create high water marks for group and user id */
 
-	status = dbwrap_fetch_uint32(ctx->db, HWM_USER, &low_id);
+	status = dbwrap_fetch_uint32_bystring(ctx->db, HWM_USER, &low_id);
 	if (!NT_STATUS_IS_OK(status) || (low_id < dom->low_id)) {
-		status = dbwrap_trans_store_uint32(ctx->db, HWM_USER,
-						   dom->low_id);
+		status = dbwrap_trans_store_uint32_bystring(ctx->db, HWM_USER,
+							    dom->low_id);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0, ("Unable to initialise user hwm in idmap "
 				  "database: %s\n", nt_errstr(status)));
@@ -78,10 +78,10 @@ static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
 		}
 	}
 
-	status = dbwrap_fetch_uint32(ctx->db, HWM_GROUP, &low_id);
+	status = dbwrap_fetch_uint32_bystring(ctx->db, HWM_GROUP, &low_id);
 	if (!NT_STATUS_IS_OK(status) || (low_id < dom->low_id)) {
-		status = dbwrap_trans_store_uint32(ctx->db, HWM_GROUP,
-						   dom->low_id);
+		status = dbwrap_trans_store_uint32_bystring(ctx->db, HWM_GROUP,
+							    dom->low_id);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0, ("Unable to initialise group hwm in idmap "
 				  "database: %s\n", nt_errstr(status)));
diff --git a/source3/wscript b/source3/wscript
index 55b859c..5b21c3b 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -1367,7 +1367,8 @@ main() {
                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
                                       vfs_crossrename vfs_linux_xfs_sgid
-                                      vfs_time_audit idmap_autorid''')
+                                      vfs_time_audit idmap_autorid idmap_tdb2
+                                      idmap_rid idmap_hash''')
 
     if Options.options.developer:
         default_static_modules.extend(TO_LIST('charset_weird'))


-- 
Samba Shared Repository