diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-05-22 14:50:36 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-05-22 14:50:36 +1000 |
commit | 61e78a2c611f68a63203d8457c50ec923b52e7ae (patch) | |
tree | 58954a5883d2bee3251c121e856a4975d4681392 | |
parent | dec930448f957aca7e70e975221a2ac060819b2e (diff) | |
download | samba-61e78a2c611f68a63203d8457c50ec923b52e7ae.tar.gz samba-61e78a2c611f68a63203d8457c50ec923b52e7ae.tar.bz2 samba-61e78a2c611f68a63203d8457c50ec923b52e7ae.zip |
minor cleanup in SMB2 getinfo test
(This used to be commit b139b471072f20288f126b5a9ee7613cc6c40681)
-rw-r--r-- | source4/torture/smb2/getinfo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index c47a26277c..906d6e4f8d 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -51,9 +51,9 @@ static struct { { LEVEL(RAW_FILEINFO_COMPRESSION_INFORMATION) }, { LEVEL(RAW_FILEINFO_NETWORK_OPEN_INFORMATION) }, { LEVEL(RAW_FILEINFO_ATTRIBUTE_TAG_INFORMATION) }, -/* -disabled until we know how the alignment now works -{ LEVEL(RAW_FILEINFO_SMB2_ALL_EAS) }, */ +/* + { LEVEL(RAW_FILEINFO_SMB2_ALL_EAS) }, +*/ { LEVEL(RAW_FILEINFO_SMB2_ALL_INFORMATION) }, { LEVEL(RAW_FILEINFO_SEC_DESC) } }; @@ -107,9 +107,6 @@ static bool torture_smb2_fileinfo(struct torture_context *tctx, struct smb2_tree file_levels[i].dinfo.query_secdesc.in.secinfo_flags = 0x7; } if (file_levels[i].level == RAW_FILEINFO_SMB2_ALL_EAS) { - if (torture_setting_bool(tctx, "samba4", false)) { - continue; - } file_levels[i].finfo.all_eas.in.continue_flags = SMB2_CONTINUE_FLAG_RESTART; file_levels[i].dinfo.all_eas.in.continue_flags = @@ -183,6 +180,9 @@ bool torture_smb2_getinfo(struct torture_context *torture) return false; } + smb2_deltree(tree, FNAME); + smb2_deltree(tree, DNAME); + status = torture_setup_complex_file(tree, FNAME); if (!NT_STATUS_IS_OK(status)) { return false; |