diff options
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/gentest.c | 4 | ||||
| -rw-r--r-- | source4/torture/libnet/libnet.c | 4 | ||||
| -rw-r--r-- | source4/torture/raw/streams.c | 13 | ||||
| -rw-r--r-- | source4/torture/rpc/netlogon.c | 9 | ||||
| -rw-r--r-- | source4/torture/rpc/samba3rpc.c | 2 |
5 files changed, 27 insertions, 5 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index c9e36b7e4e..d50393baf0 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -1637,7 +1637,8 @@ static bool cmp_fileinfo(int instance, case RAW_FILEINFO_UNIX_BASIC: case RAW_FILEINFO_UNIX_LINK: case RAW_FILEINFO_SMB2_ALL_EAS: - case RAW_FILEINFO_SMB2_ALL_INFORMATION: + case RAW_FILEINFO_SMB2_ALL_INFORMATION: + case RAW_FILEINFO_UNIX_INFO2: break; } @@ -1775,6 +1776,7 @@ static void gen_setfileinfo(int instance, union smb_setfileinfo *info) case RAW_SFILEINFO_1032: case RAW_SFILEINFO_1039: case RAW_SFILEINFO_1040: + case RAW_SFILEINFO_UNIX_INFO2: /* Untested */ break; } diff --git a/source4/torture/libnet/libnet.c b/source4/torture/libnet/libnet.c index 261012edae..3a75ffcae3 100644 --- a/source4/torture/libnet/libnet.c +++ b/source4/torture/libnet/libnet.c @@ -19,6 +19,10 @@ #include "includes.h" #include "torture/torture.h" +#include "librpc/rpc/dcerpc.h" +#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/lsa.h" +#include "libnet/composite.h" #include "torture/libnet/proto.h" NTSTATUS torture_net_init(void) 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 diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 74bc3a2bf7..a13172b695 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -647,6 +647,10 @@ static bool test_DatabaseSync(struct torture_context *tctx, if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) break; + /* Native mode servers don't do this */ + if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { + return true; + } torture_assert_ntstatus_ok(tctx, status, "DatabaseSync"); if (!creds_client_check(creds, &r.out.return_authenticator.cred)) { @@ -968,6 +972,11 @@ static bool test_DatabaseSync2(struct torture_context *tctx, if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) break; + /* Native mode servers don't do this */ + if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { + return true; + } + torture_assert_ntstatus_ok(tctx, status, "DatabaseSync2"); if (!creds_client_check(creds, &r.out.return_authenticator.cred)) { 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; } |