[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  d3b4c2c UTIL_TDB: lowercase name.
       via  a38e2cb libtorture: Improve suggestion to mention torture_assert_*() rather than torture_result().
      from  027f2b3 s4:torture: add a new smb2.session.reauth3 test - getting security descriptor

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


- Log -----------------------------------------------------------------
commit d3b4c2c7714091a588f6aeaf784380cea54e73cf
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu May 3 18:26:35 2012 +0200

    UTIL_TDB: lowercase name.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Thu May  3 20:18:22 CEST 2012 on sn-devel-104

commit a38e2cbbb31866c4af3b352a9dbbfcabb41ab4b8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu May 3 16:38:31 2012 +0200

    libtorture: Improve suggestion to mention torture_assert_*() rather than
    torture_result().

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

Summary of changes:
 lib/torture/torture.c               |    2 +-
 lib/util/wscript_build              |    4 ++--
 libcli/auth/wscript_build           |    2 +-
 source3/wscript_build               |    6 +++---
 source4/lib/messaging/wscript_build |    2 +-
 source4/ntvfs/common/wscript_build  |    2 +-
 source4/param/wscript_build         |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index a2799ef..1b0a956 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -444,7 +444,7 @@ static bool internal_torture_run_test(struct torture_context *context,
 	    if (!success && context->last_result == TORTURE_OK) {
 		    if (context->last_reason == NULL)
 			    context->last_reason = talloc_strdup(context,
-					"Unknown error/failure. Missing torture_fail() or torture_result() call?");
+					"Unknown error/failure. Missing torture_fail() or torture_assert_*() call?");
 		    context->last_result = TORTURE_ERROR;
 	    }
 	}
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 79b9f02..d50592b 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -47,11 +47,11 @@ bld.SAMBA_LIBRARY('wrap_xattr',
 	)
 
 
-bld.SAMBA_LIBRARY('UTIL_TDB',
+bld.SAMBA_LIBRARY('util_tdb',
 	source='util_tdb.c',
 	local_include=False,
 	public_deps='tdb_compat talloc',
-                  private_library=True
+	private_library=True
 	)
 
 bld.SAMBA_LIBRARY('tevent-util',
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 893cfd9..092d5e4 100755
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -25,7 +25,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
 
 bld.SAMBA_SUBSYSTEM('COMMON_SCHANNEL',
 	source='schannel_state_tdb.c schannel_sign.c',
-	deps='tdb-wrap UTIL_TDB samba-hostconfig NDR_NETLOGON'
+	deps='tdb-wrap util_tdb samba-hostconfig NDR_NETLOGON'
 	)
 
 
diff --git a/source3/wscript_build b/source3/wscript_build
index dc01750..91ea293 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -749,7 +749,7 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
 
 bld.SAMBA3_LIBRARY('smbregistry',
                    source=REG_BASE_SRC,
-                   deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc
+                   deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
                    replace util_reg samba-util security
                    errors3 dbwrap samba3-util''',
                    allow_undefined_symbols=True,
@@ -783,7 +783,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source=LIB_UTIL_SRC,
-                   deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan',
+                   deps='ndr security NDR_SECURITY samba-util util_tdb ccan',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('pidfile',
@@ -1063,7 +1063,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
 
 bld.SAMBA3_LIBRARY('dbwrap',
                    source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c lib/dbwrap/dbwrap_tdb.c',
-                   deps='samba-util UTIL_TDB errors tdb tdb-wrap',
+                   deps='samba-util util_tdb errors tdb tdb-wrap',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('samba3-util',
diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build
index b7d4fed..38f1fab 100644
--- a/source4/lib/messaging/wscript_build
+++ b/source4/lib/messaging/wscript_build
@@ -3,7 +3,7 @@
 
 bld.SAMBA_SUBSYSTEM('MESSAGING',
 	source='messaging.c',
-	public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS UTIL_TDB cluster ndr samba_socket dcerpc'
+	public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS util_tdb cluster ndr samba_socket dcerpc'
 	)
 
 
diff --git a/source4/ntvfs/common/wscript_build b/source4/ntvfs/common/wscript_build
index b16f8fa..b144472 100644
--- a/source4/ntvfs/common/wscript_build
+++ b/source4/ntvfs/common/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('ntvfs_common',
 	source='init.c brlock.c brlock_tdb.c opendb.c opendb_tdb.c notify.c',
 	autoproto='proto.h',
-	deps='UTIL_TDB tdb-wrap',
+	deps='util_tdb tdb-wrap',
 	public_deps='NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share'
 	)
 
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 80b2758..4585a83 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -32,7 +32,7 @@ bld.SAMBA_MODULE('share_ldb',
 
 bld.SAMBA_SUBSYSTEM('SECRETS',
 	source='secrets.c',
-	deps='ldb tdb-wrap UTIL_TDB NDR_SECURITY tevent ldbwrap'
+	deps='ldb tdb-wrap util_tdb NDR_SECURITY tevent ldbwrap'
 	)
 
 


-- 
Samba Shared Repository