From 3115481e32c722645e1974acb3525ea52a5b2d08 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 17 Jan 2008 09:24:01 +0100 Subject: Fix an output message in samba3rpc torture test. Michael (This used to be commit bf957bcb835a2c7c903f60dfa8f9a7e41997c5af) --- source4/torture/rpc/samba3rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/torture') diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 3b96140fb2..b08cd05bdb 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -529,7 +529,7 @@ static bool create_user(TALLOC_CTX *mem_ctx, struct smbcli_state *cli, username, domain_name, &samr_pipe, &wks_handle, user_sid); if (!NT_STATUS_IS_OK(status)) { - d_printf("get_wks_handle failed: %s\n", nt_errstr(status)); + d_printf("get_usr_handle failed: %s\n", nt_errstr(status)); goto done; } -- cgit From 66871f9950f1998c97f97c9a095953c66ab4ab64 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Jan 2008 15:51:02 +0100 Subject: Add an exception for S3 Doing this correctly would involve a create_file call for qpathinfo (This used to be commit da9a5b571ea87b2e08c74463d3fae58a9eb0828a) --- source4/torture/raw/streams.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index bbc0bcae82..ca6b488af5 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -490,9 +490,16 @@ static bool test_stream_delete(struct torture_context *tctx, status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); CHECK_STATUS(status, NT_STATUS_DELETE_PENDING); - finfo.generic.in.file.path = sname1; - status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); - CHECK_STATUS(status, NT_STATUS_DELETE_PENDING); + if (!torture_setting_bool(tctx, "samba3", false)) { + + /* + * S3 doesn't do this yet + */ + + finfo.generic.in.file.path = sname1; + status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); + CHECK_STATUS(status, NT_STATUS_DELETE_PENDING); + } /* * fd-based qfileinfo on the stream still works, the stream does not -- cgit