[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f033c22 policy/python: Move python binding tests to standard
location.
via aaffd99 selftest/tests.py: Fix name of selftest.py for benefit of
--load-list.
via b9ac1f4 selftest.py: Only run teardown_all when actually relevant.
from 074ee6f s3-rpc_server: Remove remaining code for embedded endpoint
mapper
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f033c221f8f459759aee259be8f52a79fd7e8f3f
Author: Jelmer Vernooij
Date: Tue Mar 6 00:46:55 2012 +0100
policy/python: Move python binding tests to standard location.
Autobuild-User: Jelmer Vernooij
Autobuild-Date: Tue Mar 6 02:26:29 CET 2012 on sn-devel-104
commit aaffd996abd9404bb942570f49ca01598ebe0fc3
Author: Jelmer Vernooij
Date: Tue Mar 6 00:39:11 2012 +0100
selftest/tests.py: Fix name of selftest.py for benefit of --load-list.
commit b9ac1f45a14b9783602fe4508b1f450dd2676bb6
Author: Jelmer Vernooij
Date: Tue Mar 6 00:38:54 2012 +0100
selftest.py: Only run teardown_all when actually relevant.
---
Summary of changes:
selftest/selftest.py |4 +---
.../python/samba/tests/policy.py} |0
source4/selftest/tests.py |4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
rename source4/{lib/policy/tests/python/bindings.py =>
scripting/python/samba/tests/policy.py} (100%)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.py b/selftest/selftest.py
index 26c409a..1b20441 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -538,12 +538,10 @@ else:
if opts.resetup_environment:
env_manager.teardown_env(envname)
+env_manager.teardown_all()
sys.stdout.write("\n")
-if not opts.list:
-env_manager.teardown_all()
-
# if there were any valgrind failures, show them
for fn in os.listdir(prefix):
if fn.startswith("valgrind.log"):
diff --git a/source4/lib/policy/tests/python/bindings.py
b/source4/scripting/python/samba/tests/policy.py
similarity index 100%
rename from source4/lib/policy/tests/python/bindings.py
rename to source4/scripting/python/samba/tests/policy.py
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index bc8bf12..d49f253 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -402,7 +402,7 @@ def planoldpythontestsuite(env, module, name=None,
extra_path=[], environ={}, ex
name = module
plantestsuite(name, env, args)
-planpythontestsuite("none", "selftest.tests.test_suite",
name="selftest.py.tests", extra_path=[srcdir()])
+planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
planpythontestsuite("none", "api", name="ldb.python",
extra_path=['lib/ldb/tests/python'])
planpythontestsuite("none", "samba.tests.credentials")
planoldpythontestsuite("dc:local", "samba.tests.gensec",
extra_args=['-U"$USERNAME%$PASSWORD"'])
@@ -466,7 +466,7 @@ planpythontestsuite("none", "samba.tests.ntacls")
plantestsuite("samba4.deletetest.python(dc)", "dc",
['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(),
srcdir()),
python,
os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
'$SERVER',
'-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
-planpythontestsuite("none", "bindings",
extra_path=["%s/lib/policy/tests/python" % samba4srcdir],
name="samba4.policy.python")
+planpythontestsuite("none", "samba.tests.policy")
plantestsuite("samba4.blackbox.samba3dump", "none", [python,
os.path.join(samba4srcdir, "scripting/bin/samba3dump"),
os.path.join(samba4srcdir, "../testdata/samba3")], allow_empty_output=True)
plantestsuite("samba4.blackbox.upgrade", "none", ["PYTHON=%s" % python,
os.path.join(samba4srcdir, "setup/tests/blackbox_s3upgrade.sh"),
'$PREFIX/provision'])
plantestsuite("samba4.blackbox.provision.py", "none", ["PYTHON=%s" % python,
os.path.join(samba4srcdir, "setup/tests/blackbox_provision.sh"),
'$PREFIX/provision'])
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 074ee6f s3-rpc_server: Remove remaining code for embedded endpoint
mapper
via be7bcf0 s3-rpc_server: Only init and register embedded RPC services
in dcesrv_ep_setup()
from cae455f s3: Fix a "Invalid (state->nread >= 0)" warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 074ee6f34c3c105d7c5d940b420ccd785c05867e
Author: Andrew Bartlett
Date: Sat Mar 3 12:49:10 2012 +1100
s3-rpc_server: Remove remaining code for embedded endpoint mapper
Signed-off-by: Andreas Schneider
Autobuild-User: Andreas Schneider
Autobuild-Date: Mon Mar 5 23:14:33 CET 2012 on sn-devel-104
commit be7bcf0e550229eb5ee15c65d3f50b8ddd5e9dff
Author: Andrew Bartlett
Date: Mon Mar 5 10:59:01 2012 +1100
s3-rpc_server: Only init and register embedded RPC services in
dcesrv_ep_setup()
This consults the two definitions for embedded, that is if the deamon is
forking
or if the rpc_server: line is set to embedded.
Andrew Bartlett
Signed-off-by: Andreas Schneider
---
Summary of changes:
source3/rpc_server/rpc_service_setup.c | 126 +---
1 files changed, 66 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/rpc_service_setup.c
b/source3/rpc_server/rpc_service_setup.c
index fc770c5..203eeb1 100644
--- a/source3/rpc_server/rpc_service_setup.c
+++ b/source3/rpc_server/rpc_service_setup.c
@@ -53,24 +53,6 @@
#include "rpc_server/rpc_config.h"
#include "rpc_server/epmapper/srv_epmapper.h"
-static bool rpc_setup_epmapper(struct tevent_context *ev_ctx,
- struct messaging_context *msg_ctx)
-{
- enum rpc_service_mode_e epm_mode = rpc_epmapper_mode();
- enum rpc_daemon_type_e epm_type = rpc_epmapper_daemon();
- NTSTATUS status;
-
- if (epm_mode != RPC_SERVICE_MODE_DISABLED &&
- epm_type != RPC_DAEMON_DISABLED) {
- status = rpc_epmapper_init(NULL);
- if (!NT_STATUS_IS_OK(status)) {
- return false;
- }
- }
-
- return true;
-}
-
/* Common routine for embedded RPC servers */
static bool rpc_setup_embedded(struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx,
@@ -140,6 +122,10 @@ static bool rpc_setup_winreg(struct tevent_context *ev_ctx,
const struct ndr_interface_table *t = &ndr_table_winreg;
const char *pipe_name = "winreg";
NTSTATUS status;
+ enum rpc_service_mode_e service_mode = rpc_service_mode(t->name);
+ if (service_mode != RPC_SERVICE_MODE_EMBEDDED) {
+ return true;
+ }
status = rpc_winreg_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
@@ -156,6 +142,10 @@ static bool rpc_setup_srvsvc(struct tevent_context *ev_ctx,
const struct ndr_interface_table *t = &ndr_table_srvsvc;
const char *pipe_name = "srvsvc";
NTSTATUS status;
+ enum rpc_service_mode_e service_mode = rpc_service_mode(t->name);
+ if (service_mode != RPC_SERVICE_MODE_EMBEDDED) {
+ return true;
+ }
status = rpc_srvsvc_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
@@ -171,20 +161,19 @@ static bool rpc_setup_lsarpc(struct tevent_context
*ev_ctx,
{
const struct ndr_interface_table *t = &ndr_table_lsarpc;
const char *pipe_name = "lsarpc";
- enum rpc_service_mode_e lsarpc_mode = rpc_lsarpc_mode();
enum rpc_daemon_type_e lsasd_type = rpc_lsasd_daemon();
NTSTATUS status;
+ enum rpc_service_mode_e service_mode = rpc_service_mode(t->name);
+ if (service_mode != RPC_SERVICE_MODE_EMBEDDED || lsasd_type !=
RPC_DAEMON_EMBEDDED) {
+ return true;
+ }
status = rpc_lsarpc_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
return false;
}
- if (lsarpc_mode == RPC_SERVICE_MODE_EMBEDDED &&
- lsasd_type != RPC_DAEMON_DISABLED) {
- return rpc_setup_embedded(ev_ctx, msg_ctx, v, t, pipe_name);
- }
- return true;
+ return rpc_setup_embedded(ev_ctx, msg_ctx, v, t, pipe_name);
}
static bool rpc_setup_samr(struct tevent_context *ev_ctx,
@@ -193,21 +182,19 @@ static bool rpc_setup_samr(struct tevent_context *ev_ctx,
{
const struct ndr_interface_table *t = &ndr_table_samr;
const char *pipe_name = "samr";
- enum rpc_service_mode_e samr_mode = rpc_samr_mode();
enum rpc_daemon_type_e lsasd_type = rpc_lsasd_daemon();
NTSTATUS status;
+ enum rpc_service_mode_e service_mode = rpc_service_mode(t->name);
+ if (service_mode != RPC_SERVICE_MODE_EMBEDDED || lsasd_type !=
RPC_DAEMON_EMBEDDED) {
+ return true;
+
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via abb2dcd WHATSNEW: Start to add changes since 3.5.12. from 8e141d6 s3-winbindd: Close netlogon connection if the status returned by the NetrSamLogonEx call is timeout in the pam_auth_crap path http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit abb2dcde786b1656c4df1e3bbe09757d640c6549 Author: Karolin Seeger Date: Mon Mar 5 21:18:13 2012 +0100 WHATSNEW: Start to add changes since 3.5.12. To be continued... Karolin --- Summary of changes: WHATSNEW.txt | 40 +++- 1 files changed, 39 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 224f13d..3cef783 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ == Release Notes for Samba 3.5.13 - , 2011 + March 12, 2012 == @@ -14,6 +14,44 @@ Changes since 3.5.12: +o Jeremy Allison +* BUG 8561: Fully observe password change settings. +* BUG 8631: Fix POSIX ACE x permission mapping to and from a DACL. + + +o Günther Deschner +* BUG 8176: Fix perl path. + + +o Björn Jacke +* BUG 8652: Document the ignore system acls option of vfs_acl_xattr and + vfs_acl_tdb. + + +o Jeff Layton +* BUG 8648: Document more undocumented mount.cifs options. + + +o Volker Lendecke +* BUG 8639: Fix the vfs_commit module. + + +o Stefan Metzmacher +* BUG 8608: Don't fail on users without a uid (Winbind). +* BUG 8645: Add missing prefixpath options for mount.cifs manpage. + + +o Karolin Seeger +* BUG 7705: Fix rpm build issues on RHEL4. + + +o Richard Sharpe +* BUG 8607: Simplify building modules outside the Samba source tree. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via cae455f s3: Fix a "Invalid (state->nread >= 0)" warning
via 216769f s3: Move the drain_socket on error to reply_write_and_X
via 82b948a s3: Use "goto out;" in reply_write_and_X
from 07386bb s3: Remove "size" param from switch_message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cae455f68802be2fa31328878be4119df1c1d864
Author: Volker Lendecke
Date: Mon Mar 5 15:56:55 2012 +0100
s3: Fix a "Invalid (state->nread >= 0)" warning
Both read_from_internal_pipe and tstream_readv_pdu_queue_recv return
ssize_t.
Autobuild-User: Volker Lendecke
Autobuild-Date: Mon Mar 5 17:38:16 CET 2012 on sn-devel-104
commit 216769f2ce7d18a7ca83bf440b6efd7ad4675675
Author: Volker Lendecke
Date: Mon Mar 5 15:40:49 2012 +0100
s3: Move the drain_socket on error to reply_write_and_X
That's the only case where this can happen, so we should not clutter the
main
code path.
commit 82b948a8160e3b5bb80238413967ed7f5798a35c
Author: Volker Lendecke
Date: Mon Mar 5 15:47:52 2012 +0100
s3: Use "goto out;" in reply_write_and_X
---
Summary of changes:
source3/rpc_server/srv_pipe_hnd.c |2 +-
source3/smbd/process.c|9 -
source3/smbd/reply.c | 36 ++--
3 files changed, 19 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_pipe_hnd.c
b/source3/rpc_server/srv_pipe_hnd.c
index 3616922..e4172e7 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -687,7 +687,7 @@ struct np_read_state {
struct np_proxy_state *p;
struct np_ipc_readv_next_vector_state next_vector;
- size_t nread;
+ ssize_t nread;
bool is_data_outstanding;
};
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 15e1efe..f61ad5d 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1521,15 +1521,6 @@ static void construct_reply(struct
smbd_server_connection *sconn,
conn = switch_message(req->cmd, req);
- if (req->unread_bytes) {
- /* writeX failed. drain socket. */
- if (drain_socket(req->sconn->sock, req->unread_bytes) !=
- req->unread_bytes) {
- smb_panic("failed to drain pending bytes");
- }
- req->unread_bytes = 0;
- }
-
if (req->done) {
TALLOC_FREE(req);
return;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 26a928f..e3a3766 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4494,8 +4494,7 @@ void reply_write_and_X(struct smb_request *req)
if ((req->wct != 12) && (req->wct != 14)) {
reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
- END_PROFILE(SMBwriteX);
- return;
+ goto out;
}
numtowrite = SVAL(req->vwv+10, 0);
@@ -4512,20 +4511,17 @@ void reply_write_and_X(struct smb_request *req)
/* Can't do a recvfile write on IPC$ */
if (IS_IPC(conn)) {
reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
- END_PROFILE(SMBwriteX);
- return;
+ goto out;
}
if (numtowrite != req->unread_bytes) {
reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
- END_PROFILE(SMBwriteX);
- return;
+ goto out;
}
} else {
if (smb_doff > smblen || smb_doff + numtowrite < numtowrite ||
smb_doff + numtowrite > smblen) {
reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
- END_PROFILE(SMBwriteX);
- return;
+ goto out;
}
}
@@ -4533,12 +4529,10 @@ void reply_write_and_X(struct smb_request *req)
if (IS_IPC(conn)) {
if (req->unread_bytes) {
reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
- END_PROFILE(SMBwriteX);
- return;
+ goto out;
}
reply_pipe_write_and_X(req);
- END_PROFILE(SMBwriteX);
- return;
+ goto out;
}
fsp = file_fsp(req, SVAL(req->vwv+2, 0));
@@ -4546,14 +4540,12 @@ void reply_write_and_X(struct smb_request *req)
write_through = BITSETW(req->vwv+7,0);
if (!check_fsp(conn, req, fsp)) {
- END_PROFILE(SMBwriteX);
- return;
+ go
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 07386bb s3: Remove "size" param from switch_message
via c99d245 s3: Remove "size" param from smb_dump
from 14d3137 s3-lsasd: Fix debug messages on registration failure
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 07386bb5331a22c7dcfc4fef1ae527f20ce279e6
Author: Volker Lendecke
Date: Mon Mar 5 13:28:07 2012 +0100
s3: Remove "size" param from switch_message
Autobuild-User: Volker Lendecke
Autobuild-Date: Mon Mar 5 15:13:49 CET 2012 on sn-devel-104
commit c99d245548e5fcf0a89b79749e52967dc29c012c
Author: Volker Lendecke
Date: Mon Mar 5 13:28:07 2012 +0100
s3: Remove "size" param from smb_dump
---
Summary of changes:
source3/smbd/process.c | 15 ---
1 files changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6c92755..15e1efe 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1304,15 +1304,16 @@ void reply_outbuf(struct smb_request *req, uint8
num_words, uint32 num_bytes)
Dump a packet to a file.
/
-static void smb_dump(const char *name, int type, const char *data, ssize_t len)
+static void smb_dump(const char *name, int type, const char *data)
{
+ size_t len;
int fd, i;
char *fname = NULL;
if (DEBUGLEVEL < 50) {
return;
}
- if (len < 4) len = smb_len(data)+4;
+ len = smb_len_tcp(data)+4;
for (i=1;i<100;i++) {
if (asprintf(&fname, "/tmp/%s.%d.%s", name, i,
type ? "req" : "resp") == -1) {
@@ -1344,7 +1345,7 @@ static void smb_dump(const char *name, int type, const
char *data, ssize_t len)
find.
/
-static connection_struct *switch_message(uint8 type, struct smb_request *req,
int size)
+static connection_struct *switch_message(uint8 type, struct smb_request *req)
{
int flags;
uint16 session_tag;
@@ -1356,7 +1357,7 @@ static connection_struct *switch_message(uint8 type,
struct smb_request *req, in
if (smb_messages[type].fn == NULL) {
DEBUG(0,("Unknown message type %d!\n",type));
- smb_dump("Unknown", 1, (const char *)req->inbuf, size);
+ smb_dump("Unknown", 1, (const char *)req->inbuf);
reply_unknown_new(req, type);
return NULL;
}
@@ -1370,7 +1371,7 @@ static connection_struct *switch_message(uint8 type,
struct smb_request *req, in
DEBUG(3,("switch message %s (pid %d) conn 0x%lx\n", smb_fn_name(type),
(int)sys_getpid(), (unsigned long)conn));
- smb_dump(smb_fn_name(type), 1, (const char *)req->inbuf, size);
+ smb_dump(smb_fn_name(type), 1, (const char *)req->inbuf);
/* Ensure this value is replaced in the incoming packet. */
SSVAL(discard_const_p(uint8_t, req->inbuf),smb_uid,session_tag);
@@ -1518,7 +1519,7 @@ static void construct_reply(struct smbd_server_connection
*sconn,
SMB_PERFCOUNT_SET_MSGLEN_IN(&req->pcd, size);
}
- conn = switch_message(req->cmd, req, size);
+ conn = switch_message(req->cmd, req);
if (req->unread_bytes) {
/* writeX failed. drain socket. */
@@ -2063,7 +2064,7 @@ void chain_reply(struct smb_request *req)
req->buflen = buflen;
req->buf = buf;
- switch_message(chain_cmd, req, smblen);
+ switch_message(chain_cmd, req);
if (req->outbuf == NULL) {
/*
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 14d3137 s3-lsasd: Fix debug messages on registration failure
via 6dbf632 selftest: Reduce declarations of smbclient_auth tests by
moving into a loop
via fc57623 selftest: run smbtorture_s3 tests against the ntvfs file
server
via 4c926a7 selftest: Reduce time in cleanup loop, try waitpid on all 3
children
via ebe8aa9 selftest: start to run more dcerpc tests against
plugin_s4_dc
via 0582d03 selftest: forward rpcecho to Samba4 in plugin_s4_dc
from 53a147d selftest.run: Factor out read_testlist_file and
open_file_or_pipe.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 14d31376aab703dbb14d1cd786baeaf84361cd96
Author: Andrew Bartlett
Date: Sat Mar 3 12:18:21 2012 +1100
s3-lsasd: Fix debug messages on registration failure
Autobuild-User: Andrew Bartlett
Autobuild-Date: Mon Mar 5 09:50:17 CET 2012 on sn-devel-104
commit 6dbf632bc3e035ffd68fe67e06657593870dc2ac
Author: Andrew Bartlett
Date: Mon Mar 5 14:52:36 2012 +1100
selftest: Reduce declarations of smbclient_auth tests by moving into a loop
commit fc5762388a725cd18d10a356960382ea050c8064
Author: Andrew Bartlett
Date: Mon Mar 5 14:28:15 2012 +1100
selftest: run smbtorture_s3 tests against the ntvfs file server
This checks not only the behaviour of the NTVFS file server, but also the
client library and authentication stack.
Andrew Bartlett
commit 4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142
Author: Andrew Bartlett
Date: Mon Mar 5 11:12:00 2012 +1100
selftest: Reduce time in cleanup loop, try waitpid on all 3 children
commit ebe8aa9cc18afa5027b1afd7b6e086613268c083
Author: Andrew Bartlett
Date: Mon Mar 5 10:46:23 2012 +1100
selftest: start to run more dcerpc tests against plugin_s4_dc
commit 0582d03efe8ef8992b5e1e6cad68ba885844682b
Author: Andrew Bartlett
Date: Mon Mar 5 10:34:30 2012 +1100
selftest: forward rpcecho to Samba4 in plugin_s4_dc
---
Summary of changes:
selftest/knownfail | 13 +
selftest/target/Samba3.pm | 18 --
selftest/target/Samba4.pm |5 +++--
source3/rpc_server/lsasd.c |6 +++---
source3/selftest/tests.py |5 ++---
source4/selftest/tests.py |3 ++-
6 files changed, 35 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index cc5d16b..1a6c6bd 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -7,6 +7,19 @@
^samba3.blackbox.failure.failure # this is designed to fail, for testing our
test infrastructure
.*driver.add_driver_timestamps # we only can store dates, not timestamps
^samba3.smbtorture_s3.LOCAL-TALLOC-DICT #fails
+^samba3.smbtorture_s3.plain\(dc\).LOCK9 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).OPLOCK2 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).STREAMERROR # Fails against the s4 ntvfs
server
+^samba3.smbtorture_s3.plain\(dc\).DIR1 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DIR-CREATETIME # Fails against the s4 ntvfs
server
+^samba3.smbtorture_s3.plain\(dc\).DELETE-LN # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).POSIX # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).UID-REGRESSION-TEST # Fails against the s4
ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).SHORTNAME-TEST # Fails against the s4 ntvfs
server
+^samba3.smbtorture_s3.plain\(dc\).POSIX-APPEND # Fails against the s4 ntvfs
server
+^samba3.smbtorture_s3.plain\(dc\).NTTRANS-FSCTL # Fails against the s4 ntvfs
server
+^samba3.smbtorture_s3.plain\(dc\).SMB2-NEGPROT # Fails against the s4 ntvfs
server
+^samba3.smbtorture_s3.plain\(dc\).BAD-NBT-SESSION # Fails against the s4 ntvfs
server
^samba3.nbt.dgram.*netlogon2
^samba3.*rap.sam.*.useradd # Not provided by Samba 3
^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 87763aa..797ae71 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -54,9 +54,12 @@ sub teardown_env($$)
# This should give it time to write out the gcov data
until ($count > 20) {
- if (Samba::cleanup_child($smbdpid, "smbd") == -1
- && Samba::cleanup_child($nmbdpid, "nmbd") == -1
- && Samba::cleanup_child($winbinddpid, "winbindd") == -1) {
+ my $smbdchild = Samba::cleanup_child($smbdpid, "smbd");
+ my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd");
+ my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd");
+ if ($smbdchild == -1
+ && $nmbdchild == -1
+ && $winbinddchild == -1) {
last;
}
