From ce9d63d1618e1cd803e68a0d97ec352a8d125070 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 22 May 2011 14:16:46 +0200 Subject: s3: Remove the smbtorture3 OPLOCK3 test This is the last user of cli_receive_smb. Oplocks are nowadays tested in smbtorture4, this mainly has historic value --- testsuite/build_farm/runlist | 2 +- testsuite/build_farm/torture-OPLOCK3.test | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 testsuite/build_farm/torture-OPLOCK3.test (limited to 'testsuite') diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist index 594c172b6ff..f9456b74ec4 100644 --- a/testsuite/build_farm/runlist +++ b/testsuite/build_farm/runlist @@ -9,7 +9,7 @@ torture-LOCK3 torture-LOCK4 torture-LOCK5 \ torture-LOCK6 torture-LOCK7 \ torture-UNLINK torture-BROWSE torture-ATTR \ torture-TRANS2 torture-TORTURE torture-OPLOCK1 \ -torture-OPLOCK3 torture-DIR torture-DIR1 torture-DENY1 \ +torture-DIR torture-DIR1 torture-DENY1 \ torture-DENY2 torture-TCON torture-TCON2 torture-TCONDEV \ torture-RW1 torture-RW2 torture-OPEN torture-XCOPY \ torture-RENAME torture-DELETE torture-PROPERTIES \ diff --git a/testsuite/build_farm/torture-OPLOCK3.test b/testsuite/build_farm/torture-OPLOCK3.test deleted file mode 100644 index f8dfb3f8e9b..00000000000 --- a/testsuite/build_farm/torture-OPLOCK3.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "OPLOCK3" -- cgit From ca1936fbb26af0ee8d0421ae6a4e07a0f62311d9 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 18:40:32 +0930 Subject: tdb_compat: use tdb_open_compat. This is a helper for the common case of opening a tdb with a logging function, but it doesn't do all the work, since TDB1 and TDB2's log functions are different types. Signed-off-by: Rusty Russell --- testsuite/printing/psec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testsuite') diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c index 24386149966..59205446d05 100644 --- a/testsuite/printing/psec.c +++ b/testsuite/printing/psec.c @@ -171,7 +171,7 @@ int psec_getsec(char *printer) slprintf(tdb_path, sizeof(tdb_path) - 1, "%s/ntdrivers.tdb", lp_lockdir()); - tdb = tdb_open(tdb_path, 0, 0, O_RDONLY, 0600); + tdb = tdb_open_compat(tdb_path, 0, 0, O_RDONLY, 0600, NULL, NULL); if (!tdb) { printf("psec: failed to open nt drivers database: %s\n", @@ -275,7 +275,7 @@ int psec_setsec(char *printer) slprintf(tdb_path, sizeof(tdb_path) - 1, "%s/ntdrivers.tdb", lp_lockdir()); - tdb = tdb_open(tdb_path, 0, 0, O_RDWR, 0600); + tdb = tdb_open_compat(tdb_path, 0, 0, O_RDWR, 0600, NULL, NULL); if (!tdb) { printf("psec: failed to open nt drivers database: %s\n", -- cgit