diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-12-21 21:15:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:29:37 -0500 |
| commit | f38b6db8b16317a3612b911621843a5afb49f5da (patch) | |
| tree | 443aec8e28be462574d604e1ab4c4fc71da64718 | |
| parent | 84e7faf6cdb4330316bf21a21b0448e074064996 (diff) | |
| download | samba-f38b6db8b16317a3612b911621843a5afb49f5da.tar.gz samba-f38b6db8b16317a3612b911621843a5afb49f5da.tar.bz2 samba-f38b6db8b16317a3612b911621843a5afb49f5da.zip | |
r20309: Don't treat non-supported EAs as fatal against Samba3.
Volker
(This used to be commit 52d9c7ed0acbc286151117bb876559e13981fd44)
| -rw-r--r-- | source4/torture/raw/mkdir.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c index 5223f9db3a..be21ff8ea3 100644 --- a/source4/torture/raw/mkdir.c +++ b/source4/torture/raw/mkdir.c @@ -123,17 +123,27 @@ static BOOL test_mkdir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) md.t2mkdir.in.eas[2].name.s = "EATHREE"; md.t2mkdir.in.eas[2].value = data_blob_talloc(mem_ctx, "xx1", 3); status = smb_raw_mkdir(cli->tree, &md); - CHECK_STATUS(status, NT_STATUS_OK); - - status = torture_check_ea(cli, path, "EAONE", "blah"); - CHECK_STATUS(status, NT_STATUS_OK); - status = torture_check_ea(cli, path, "EA TWO", "foo bar"); - CHECK_STATUS(status, NT_STATUS_OK); - status = torture_check_ea(cli, path, "EATHREE", "xx1"); - CHECK_STATUS(status, NT_STATUS_OK); - status = smb_raw_rmdir(cli->tree, &rd); - CHECK_STATUS(status, NT_STATUS_OK); + if (lp_parm_bool(-1, "torture", "samba3", False) + && NT_STATUS_EQUAL(status, NT_STATUS_EAS_NOT_SUPPORTED)) { + d_printf("EAS not supported -- not treating as fatal\n"); + } + else { + /* + * In Samba3, don't see this error as fatal + */ + CHECK_STATUS(status, NT_STATUS_OK); + + status = torture_check_ea(cli, path, "EAONE", "blah"); + CHECK_STATUS(status, NT_STATUS_OK); + status = torture_check_ea(cli, path, "EA TWO", "foo bar"); + CHECK_STATUS(status, NT_STATUS_OK); + status = torture_check_ea(cli, path, "EATHREE", "xx1"); + CHECK_STATUS(status, NT_STATUS_OK); + + status = smb_raw_rmdir(cli->tree, &rd); + CHECK_STATUS(status, NT_STATUS_OK); + } done: smb_raw_exit(cli->session); |