diff options
| author | Günther Deschner <gd@samba.org> | 2006-09-23 09:13:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:20:15 -0500 |
| commit | 3f028fb5505721eb35d0651fe49c881d43a8b1b3 (patch) | |
| tree | d9fb060e52073856939ef6a2a43b1e30bda6463f /source4/torture | |
| parent | 783512eca22979af09b2b807842d4ace763ff578 (diff) | |
| download | samba-3f028fb5505721eb35d0651fe49c881d43a8b1b3.tar.gz samba-3f028fb5505721eb35d0651fe49c881d43a8b1b3.tar.bz2 samba-3f028fb5505721eb35d0651fe49c881d43a8b1b3.zip | |
r18844: Workaround win2k behaviour (which returns WERR_NO_MORE_ITEMS instead of
WERR_OK) in the dfs torture test.
Guenther
(This used to be commit dc1b8a3aae9f00fb7dfb0dc2fdd2ee3647ecebf1)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/rpc/dfs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index 9815d71ca1..3eebfc5e5d 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -200,7 +200,8 @@ static BOOL test_GetInfoLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 if (!NT_STATUS_IS_OK(status)) { printf("GetInfo failed - %s\n", nt_errstr(status)); return False; - } else if (!W_ERROR_IS_OK(r.out.result)) { + } else if (!W_ERROR_IS_OK(r.out.result) && + !W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, r.out.result)) { printf("dfs_GetInfo failed - %s\n", win_errstr(r.out.result)); return False; } @@ -212,7 +213,7 @@ static BOOL test_GetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, const char { BOOL ret = True; /* 103, 104, 105, 106 is only available on Set */ - uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 100, 101, 102, 103, 104, 105, 106, 200, 300}; + uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 100, 101, 102, 103, 104, 105, 106}; int i; for (i=0;i<ARRAY_SIZE(levels);i++) { @@ -310,7 +311,8 @@ static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16_t if (!NT_STATUS_IS_OK(status)) { printf("Enum failed - %s\n", nt_errstr(status)); return False; - } else if (!W_ERROR_IS_OK(r.out.result)) { + } else if (!W_ERROR_IS_OK(r.out.result) && + !W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, r.out.result)) { printf("dfs_Enum failed - %s\n", win_errstr(r.out.result)); return False; } |