[SCM] Samba Shared Repository - branch v3-6-test updated
Stefan Metzmacher
metze at samba.org
Mon Jan 3 07:47:49 MST 2011
The branch, v3-6-test has been updated
via 07a4db9 talloc: Fix warnings in test code
via 6ab39cb s4: Happy New Year 2011
via 3415b93 s3: Happy New Year 2011
from d27093f s3:winbindd/idmap_ad.c: update my C
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 07a4db9db087ffe7a773a893b045691a75917689
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Jan 2 12:33:12 2011 +1100
talloc: Fix warnings in test code
This should not change any behaviour - the intent is just to reduce
the "nuisance" warnings.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Mon Jan 3 11:12:39 CET 2011 on sn-devel-104
(cherry picked from commit 10b1ed670f215d1cd4252374b4040e4cbf58723a)
commit 6ab39cb5417b5fabf57d38fda02a39d138165bb1
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 2 17:55:55 2011 +0100
s4: Happy New Year 2011
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Sun Jan 2 18:42:12 CET 2011 on sn-devel-104
(cherry picked from commit 4d5c0c3ec5a0c7a95b25eed5149e8cf665f295c9)
commit 3415b9340c2d54f7d30d3bb358ee3ca910c2d1cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 2 17:55:05 2011 +0100
s3: Happy New Year 2011
metze
(cherry picked from commit 81a167b5df47e8964fbd0f12d9ba16b41a0625a4)
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/talloc_testsuite.h | 7 +++++++
lib/talloc/testsuite.c | 5 ++++-
lib/talloc/testsuite_main.c | 3 +--
source3/include/smb.h | 2 +-
source4/smbd/server.c | 2 +-
5 files changed, 14 insertions(+), 5 deletions(-)
create mode 100644 lib/talloc/talloc_testsuite.h
Changeset truncated at 500 lines:
diff --git a/lib/talloc/talloc_testsuite.h b/lib/talloc/talloc_testsuite.h
new file mode 100644
index 0000000..acb9701
--- /dev/null
+++ b/lib/talloc/talloc_testsuite.h
@@ -0,0 +1,7 @@
+#ifndef __LIB_TALLOC_TALLOC_TESTSUITE_H__
+#define __LIB_TALLOC_TALLOC_TESTSUITE_H__
+
+struct torture_context;
+bool torture_local_talloc(struct torture_context *tctx);
+
+#endif
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 5e9b3ec..0026931 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -27,6 +27,8 @@
#include "system/time.h"
#include <talloc.h>
+#include "talloc_testsuite.h"
+
static struct timeval timeval_current(void)
{
struct timeval tv;
@@ -101,6 +103,7 @@ static double timeval_elapsed(struct timeval *tv)
static unsigned int test_abort_count;
+#if 0
static void test_abort_fn(const char *reason)
{
printf("# test_abort_fn(%s)\n", reason);
@@ -112,6 +115,7 @@ static void test_abort_start(void)
test_abort_count = 0;
talloc_set_abort_fn(test_abort_fn);
}
+#endif
static void test_abort_stop(void)
{
@@ -1171,7 +1175,6 @@ static void test_reset(void)
talloc_enable_null_tracking_no_autofree();
}
-struct torture_context;
bool torture_local_talloc(struct torture_context *tctx)
{
bool ret = true;
diff --git a/lib/talloc/testsuite_main.c b/lib/talloc/testsuite_main.c
index 1b51333..50ce0f8 100644
--- a/lib/talloc/testsuite_main.c
+++ b/lib/talloc/testsuite_main.c
@@ -25,8 +25,7 @@
#include "replace.h"
-struct torture_context;
-bool torture_local_talloc(struct torture_context *tctx);
+#include "talloc_testsuite.h"
int main(void)
{
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1957504..1a76691 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
#define _SMB_H
/* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2010"
+#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2011"
#if defined(LARGE_SMB_OFF_T)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 1c6a11d..2087ca7 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -365,7 +365,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
umask(0);
DEBUG(0,("%s version %s started.\n", binary_name, SAMBA_VERSION_STRING));
- DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2010\n"));
+ DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2011\n"));
if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4 || sizeof(uint64_t) < 8) {
DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
--
Samba Shared Repository
More information about the samba-cvs
mailing list