The branch, master has been updated
via bfafb0c s3:dbwrap_ctdb: set errno = ENOSYS if clustering is not
supported
via 160ca49 libtorture: factor out simple ui backend
via c3f1aed s3:dbwrap: remove unused args from db_open_file()
via fe74b77 s3:dbwrap: let dbwrap_fetch_uint32 distinguish between "not
found" and "wrong format"
via ae03767 dynconfig/config.m4: disallow --prefix=/usr and
--prefix=/usr/local without --enable-fhs
from 914b02b libwbclient: bump ABI to 0.11 as wbcAuthenticateUserEx now
provides PAC parsing
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bfafb0ce838c0cc3003c35e16c99d9eb9e1266a8
Author: Gregor Beck <[email protected]>
Date: Tue Nov 8 16:06:56 2011 +0100
s3:dbwrap_ctdb: set errno = ENOSYS if clustering is not supported
Signed-off-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Fri Sep 21 18:05:56 CEST 2012 on sn-devel-104
commit 160ca49953570fe55fe089241d1ba6ed1c9c9783
Author: Gregor Beck <[email protected]>
Date: Tue Oct 18 13:15:22 2011 +0200
libtorture: factor out simple ui backend
Signed-off-by: Stefan Metzmacher <[email protected]>
commit c3f1aed86f7f414ecdf676d52011c396e65aa374
Author: Gregor Beck <[email protected]>
Date: Tue Oct 25 14:51:23 2011 +0200
s3:dbwrap: remove unused args from db_open_file()
Signed-off-by: Stefan Metzmacher <[email protected]>
commit fe74b777d2beb6d033b68c271d9c869789cc4ac5
Author: Gregor Beck <[email protected]>
Date: Tue Oct 25 09:33:05 2011 +0200
s3:dbwrap: let dbwrap_fetch_uint32 distinguish between "not found" and
"wrong format"
Signed-off-by: Stefan Metzmacher <[email protected]>
commit ae037670b83557d8591c633896186a3634de30cc
Author: Stefan Metzmacher <[email protected]>
Date: Wed Jan 18 08:33:37 2012 +0100
dynconfig/config.m4: disallow --prefix=/usr and --prefix=/usr/local without
--enable-fhs
This matches the waf configure behavior and catches the case where old build
scripts try '--with-fhs' instead of '--enable-fhs'.
metze
-----------------------------------------------------------------------
Summary of changes:
dynconfig/config.m4 | 4 ++
lib/dbwrap/dbwrap_file.c | 3 +-
lib/dbwrap/dbwrap_file.h | 5 +--
lib/dbwrap/dbwrap_util.c | 7 ++-
lib/torture/simple.c | 85 ++++++++++++++++++++++++++++++++++++++
lib/torture/torture.h | 1 +
lib/torture/wscript_build | 2 +-
source3/lib/dbwrap/dbwrap_ctdb.c | 1 +
source4/torture/smbtorture.c | 65 +----------------------------
9 files changed, 100 insertions(+), 73 deletions(-)
create mode 100644 lib/torture/simple.c
Changeset truncated at 500 lines:
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index 842a960..6b5dfdb 100644
--- a/dynconfig/config.m4
+++ b/dynconfig/config.m4
@@ -19,6 +19,10 @@ AC_ARG_ENABLE(fhs,
[AS_HELP_STRING([--enable-fhs], [Turn on FHS support (default=no)])])
if test x$enable_fhs != xyes; then
+ if test x"$prefix" = x"/usr" -o x"$prefix" = x"/usr/local"; then
+ AC_MSG_WARN([Don't install directly under /usr or /usr/local
without using the FHS option (--enable-fhs)])
+ AC_MSG_ERROR([invalid --prefix=$prefix])
+ fi
MODULESDIR="${libdir}"
INCLUDEDIR="${includedir}"
SETUPDIR="${datadir}/setup"
diff --git a/lib/dbwrap/dbwrap_file.c b/lib/dbwrap/dbwrap_file.c
index 54ed320..50e43b7 100644
--- a/lib/dbwrap/dbwrap_file.c
+++ b/lib/dbwrap/dbwrap_file.c
@@ -347,9 +347,8 @@ static int db_file_traverse(struct db_context *db,
}
struct db_context *db_open_file(TALLOC_CTX *mem_ctx,
- struct messaging_context *msg_ctx,
const char *name,
- int hash_size, int tdb_flags,
+ int tdb_flags,
int open_flags, mode_t mode)
{
struct db_context *result = NULL;
diff --git a/lib/dbwrap/dbwrap_file.h b/lib/dbwrap/dbwrap_file.h
index 002f64d..1766703 100644
--- a/lib/dbwrap/dbwrap_file.h
+++ b/lib/dbwrap/dbwrap_file.h
@@ -24,12 +24,9 @@
struct db_context;
-struct messaging_context;
-
struct db_context *db_open_file(TALLOC_CTX *mem_ctx,
- struct messaging_context *msg_ctx,
const char *name,
- int hash_size, int tdb_flags,
+ int tdb_flags,
int open_flags, mode_t mode);
diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 119c7e1..d0a34cc 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -112,10 +112,13 @@ NTSTATUS dbwrap_fetch_uint32_bystring(struct db_context
*db,
return status;
}
- if ((dbuf.dptr == NULL) || (dbuf.dsize != sizeof(uint32_t))) {
- TALLOC_FREE(dbuf.dptr);
+ if ((dbuf.dptr == NULL) || (dbuf.dsize == 0)) {
return NT_STATUS_NOT_FOUND;
}
+ if (dbuf.dsize != sizeof(uint32_t)) {
+ TALLOC_FREE(dbuf.dptr);
+ return NT_STATUS_UNSUCCESSFUL;
+ }
*val = IVAL(dbuf.dptr, 0);
TALLOC_FREE(dbuf.dptr);
diff --git a/lib/torture/simple.c b/lib/torture/simple.c
new file mode 100644
index 0000000..d234776
--- /dev/null
+++ b/lib/torture/simple.c
@@ -0,0 +1,85 @@
+/*
+ Unix SMB/CIFS implementation.
+ SMB torture tester
+ Copyright (C) Andrew Tridgell 1997-2003
+ Copyright (C) Jelmer Vernooij 2006-2008
+
+ 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "lib/torture/torture.h"
+
+static struct timeval last_suite_started;
+
+static void simple_suite_start(struct torture_context *ctx,
+ struct torture_suite *suite)
+{
+ last_suite_started = timeval_current();
+ printf("Running %s\n", suite->name);
+}
+
+static void simple_suite_finish(struct torture_context *ctx,
+ struct torture_suite *suite)
+{
+
+ printf("%s took %g secs\n\n", suite->name,
+ timeval_elapsed(&last_suite_started));
+}
+
+static void simple_test_result(struct torture_context *context,
+ enum torture_result res, const char *reason)
+{
+ switch (res) {
+ case TORTURE_OK:
+ if (reason)
+ printf("OK: %s\n", reason);
+ break;
+ case TORTURE_FAIL:
+ printf("TEST %s FAILED! - %s\n", context->active_test->name,
reason);
+ break;
+ case TORTURE_ERROR:
+ printf("ERROR IN TEST %s! - %s\n", context->active_test->name,
reason);
+ break;
+ case TORTURE_SKIP:
+ printf("SKIP: %s - %s\n", context->active_test->name, reason);
+ break;
+ }
+}
+
+static void simple_comment(struct torture_context *test,
+ const char *comment)
+{
+ printf("%s", comment);
+}
+
+static void simple_warning(struct torture_context *test,
+ const char *comment)
+{
+ fprintf(stderr, "WARNING: %s\n", comment);
+}
+
+static void simple_progress(struct torture_context *test,
+ int offset, enum torture_progress_whence whence)
+{
+}
+
+const struct torture_ui_ops torture_simple_ui_ops = {
+ .comment = simple_comment,
+ .warning = simple_warning,
+ .suite_start = simple_suite_start,
+ .suite_finish = simple_suite_finish,
+ .test_result = simple_test_result,
+ .progress = simple_progress,
+};
diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index 96cefcf..3a08042 100644
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -546,5 +546,6 @@ struct torture_results *torture_results_init(TALLOC_CTX
*mem_ctx, const struct t
struct torture_context *torture_context_child(struct torture_context *tctx);
extern const struct torture_ui_ops torture_subunit_ui_ops;
+extern const struct torture_ui_ops torture_simple_ui_ops;
#endif /* __TORTURE_UI_H__ */
diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build
index a68707a..732e24a 100644
--- a/lib/torture/wscript_build
+++ b/lib/torture/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('torture',
- source='torture.c subunit.c',
+ source='torture.c subunit.c simple.c',
vnum='0.0.1',
pc_files='torture.pc',
public_deps='samba-hostconfig samba-util errors talloc tevent subunit',
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 6d46586..9a03607 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -1642,6 +1642,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
enum dbwrap_lock_order lock_order)
{
DEBUG(3, ("db_open_ctdb: no cluster support!\n"));
+ errno = ENOSYS;
return NULL;
}
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 04ba94d..95f0719 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -350,69 +350,6 @@ _NORETURN_ static void max_runtime_handler(int sig)
exit(1);
}
-struct timeval last_suite_started;
-
-static void simple_suite_start(struct torture_context *ctx,
- struct torture_suite *suite)
-{
- last_suite_started = timeval_current();
- printf("Running %s\n", suite->name);
-}
-
-static void simple_suite_finish(struct torture_context *ctx,
- struct torture_suite *suite)
-{
-
- printf("%s took %g secs\n\n", suite->name,
- timeval_elapsed(&last_suite_started));
-}
-
-static void simple_test_result(struct torture_context *context,
- enum torture_result res, const char *reason)
-{
- switch (res) {
- case TORTURE_OK:
- if (reason)
- printf("OK: %s\n", reason);
- break;
- case TORTURE_FAIL:
- printf("TEST %s FAILED! - %s\n", context->active_test->name,
reason);
- break;
- case TORTURE_ERROR:
- printf("ERROR IN TEST %s! - %s\n", context->active_test->name,
reason);
- break;
- case TORTURE_SKIP:
- printf("SKIP: %s - %s\n", context->active_test->name, reason);
- break;
- }
-}
-
-static void simple_comment(struct torture_context *test,
- const char *comment)
-{
- printf("%s", comment);
-}
-
-static void simple_warning(struct torture_context *test,
- const char *comment)
-{
- fprintf(stderr, "WARNING: %s\n", comment);
-}
-
-static void simple_progress(struct torture_context *test,
- int offset, enum torture_progress_whence whence)
-{
-}
-
-const static struct torture_ui_ops std_ui_ops = {
- .comment = simple_comment,
- .warning = simple_warning,
- .suite_start = simple_suite_start,
- .suite_finish = simple_suite_finish,
- .test_result = simple_test_result,
- .progress = simple_progress,
-};
-
/****************************************************************************
main program
****************************************************************************/
@@ -653,7 +590,7 @@ int main(int argc,char *argv[])
srandom(torture_seed);
if (!strcmp(ui_ops_name, "simple")) {
- ui_ops = &std_ui_ops;
+ ui_ops = &torture_simple_ui_ops;
} else if (!strcmp(ui_ops_name, "subunit")) {
ui_ops = &torture_subunit_ui_ops;
} else {
--
Samba Shared Repository
