From 7da94cc4a664521be279b019e9f32121cd410193 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 11 Apr 2010 01:39:06 +0200 Subject: subunit: Support formatting compatible with upstream subunit, for consistency. Upstream subunit makes a ":" after commands optional, so I've fixed any places where we might trigger commands accidently. I've filed a bug about this in subunit. --- source4/torture/smb2/acls.c | 10 +++--- source4/torture/smb2/create.c | 18 +++++----- source4/torture/smb2/dir.c | 2 +- source4/torture/smb2/notify.c | 78 +++++++++++++++++++++---------------------- 4 files changed, 54 insertions(+), 54 deletions(-) (limited to 'source4/torture/smb2') diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c index 8177a1ab2e..45107083c4 100644 --- a/source4/torture/smb2/acls.c +++ b/source4/torture/smb2/acls.c @@ -397,7 +397,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr expected_mask_anon |= SEC_STD_DELETE; } - torture_comment(tctx, "testing generic bits 0x%08x\n", + torture_comment(tctx, "Testing generic bits 0x%08x\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, owner_sid, NULL, @@ -438,7 +438,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr continue; } - torture_comment(tctx, "testing generic bits 0x%08x (anonymous)\n", + torture_comment(tctx, "Testing generic bits 0x%08x (anonymous)\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, SID_NT_ANONYMOUS, NULL, @@ -554,7 +554,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr expected_mask_anon |= SEC_STD_DELETE; } - torture_comment(tctx, "testing generic bits 0x%08x\n", + torture_comment(tctx, "Testing generic bits 0x%08x\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, owner_sid, NULL, @@ -595,7 +595,7 @@ static bool test_generic_bits(struct torture_context *tctx, struct smb2_tree *tr continue; } - torture_comment(tctx, "testing generic bits 0x%08x (anonymous)\n", + torture_comment(tctx, "Testing generic bits 0x%08x (anonymous)\n", file_mappings[i].gen_bits); sd = security_descriptor_dacl_create(tctx, 0, SID_NT_ANONYMOUS, NULL, @@ -1125,7 +1125,7 @@ static bool test_inheritance(struct torture_context *tctx, struct smb2_tree *tre } } - torture_comment(tctx, "testing access checks on inherited create with %s\n", fname1); + torture_comment(tctx, "Testing access checks on inherited create with %s\n", fname1); sd = security_descriptor_dacl_create(tctx, 0, NULL, NULL, owner_sid, diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c index c573f25172..2e32ee03a0 100644 --- a/source4/torture/smb2/create.c +++ b/source4/torture/smb2/create.c @@ -393,7 +393,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing alloc size\n"); + torture_comment(tctx, "Testing alloc size\n"); io.in.alloc_size = 4096; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -402,7 +402,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing durable open\n"); + torture_comment(tctx, "Testing durable open\n"); io.in.durable_open = true; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -410,7 +410,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing query maximal access\n"); + torture_comment(tctx, "Testing query maximal access\n"); io.in.query_maximal_access = true; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -419,13 +419,13 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing timewarp\n"); + torture_comment(tctx, "Testing timewarp\n"); io.in.timewarp = 10000; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); io.in.timewarp = 0; - torture_comment(tctx, "testing query_on_disk\n"); + torture_comment(tctx, "Testing query_on_disk\n"); io.in.query_on_disk_id = true; status = smb2_create(tree, tctx, &io); CHECK_STATUS(status, NT_STATUS_OK); @@ -433,7 +433,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing unknown tag\n"); + torture_comment(tctx, "Testing unknown tag\n"); status = smb2_create_blob_add(tctx, &io.in.blobs, "FooO", data_blob(NULL, 0)); CHECK_STATUS(status, NT_STATUS_OK); @@ -444,7 +444,7 @@ static bool test_create_blob(struct torture_context *tctx, struct smb2_tree *tre status = smb2_util_close(tree, io.out.file.handle); CHECK_STATUS(status, NT_STATUS_OK); - torture_comment(tctx, "testing bad tag length\n"); + torture_comment(tctx, "Testing bad tag length\n"); status = smb2_create_blob_add(tctx, &io.in.blobs, "xxx", data_blob(NULL, 0)); CHECK_STATUS(status, NT_STATUS_OK); @@ -1083,7 +1083,7 @@ static bool test_smb2_leading_slash(struct torture_context *tctx, static bool test_create_acl_file(struct torture_context *tctx, struct smb2_tree *tree) { - torture_comment(tctx, "testing nttrans create with sec_desc on files\n"); + torture_comment(tctx, "Testing nttrans create with sec_desc on files\n"); return test_create_acl_ext(tctx, tree, false); } @@ -1091,7 +1091,7 @@ static bool test_create_acl_file(struct torture_context *tctx, static bool test_create_acl_dir(struct torture_context *tctx, struct smb2_tree *tree) { - torture_comment(tctx, "testing nttrans create with sec_desc on directories\n"); + torture_comment(tctx, "Testing nttrans create with sec_desc on directories\n"); return test_create_acl_ext(tctx, tree, true); } diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c index b1a85392a7..dbd1a19a45 100644 --- a/source4/torture/smb2/dir.c +++ b/source4/torture/smb2/dir.c @@ -432,7 +432,7 @@ static bool test_one_file(struct torture_context *tctx, /* call all the File Information Classes */ for (i=0;i