summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/build_farm/runlist2
-rw-r--r--testsuite/build_farm/torture-OPLOCK3.test2
-rw-r--r--testsuite/printing/psec.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index 594c172b6f..f9456b74ec 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 f8dfb3f8e9..0000000000
--- a/testsuite/build_farm/torture-OPLOCK3.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "OPLOCK3"
diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c
index 2438614996..59205446d0 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",