From 4cff81603ab55ebdbe1e7581fa91d6538231e3cf Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 18 Jul 2023 11:35:22 +0200 Subject: [PATCH] s3:torture: Fix code spelling Signed-off-by: Andreas Schneider Reviewed-by: Joseph Sutton --- source3/torture/cmd_vfs.c | 2 +- source3/torture/denytest.c | 4 ++-- source3/torture/pdbtest.c | 8 ++++---- source3/torture/test_messaging_fd_passing.c | 2 +- source3/torture/test_posix.c | 4 ++-- source3/torture/test_smb1_dfs.c | 10 +++++----- source3/torture/test_smb2.c | 2 +- source3/torture/torture.c | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c index 9939f2d2c2f..9127a99f8e7 100644 --- a/source3/torture/cmd_vfs.c +++ b/source3/torture/cmd_vfs.c @@ -1027,7 +1027,7 @@ static NTSTATUS cmd_fchown(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, gid = atoi(argv[3]); fd = atoi(argv[1]); if (fd < 0 || fd >= 1024) { - printf("fchown: faliure=%d (file descriptor out of range)\n", EBADF); + printf("fchown: failure=%d (file descriptor out of range)\n", EBADF); return NT_STATUS_OK; } if (vfs->files[fd] == NULL) { diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c index 7fb78bda136..34497c3b9bb 100644 --- a/source3/torture/denytest.c +++ b/source3/torture/denytest.c @@ -1495,7 +1495,7 @@ bool torture_denytest1(int dummy) correct = False; } - printf("finshed denytest1\n"); + printf("finished denytest1\n"); return correct; } @@ -1594,7 +1594,7 @@ bool torture_denytest2(int dummy) correct = False; } - printf("finshed denytest2\n"); + printf("finished denytest2\n"); return correct; } diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c index d3895127af2..d153f3e56c8 100644 --- a/source3/torture/pdbtest.c +++ b/source3/torture/pdbtest.c @@ -364,15 +364,15 @@ static bool test_auth(TALLOC_CTX *mem_ctx, struct samu *pdb_entry) if (!dom_sid_equal(info3_sam->base.domain_sid, info3_auth->base.domain_sid)) { struct dom_sid_buf buf1, buf2; - DEBUG(0, ("domain_sid in SAM info3 %s does not match domain_sid in AUTH info3 %s\n", + DEBUG(0, ("domain_sid in SAM info3 %s does not match domain_sid in AUTH info3 %s\n", dom_sid_str_buf(info3_sam->base.domain_sid, &buf1), dom_sid_str_buf(info3_auth->base.domain_sid, &buf2))); return False; } - - /* TODO: - * Compre more details from the two info3 structures, + + /* TODO: + * Compare more details from the two info3 structures, * then test that an expired/disabled/pwdmustchange account * returns the correct errors */ diff --git a/source3/torture/test_messaging_fd_passing.c b/source3/torture/test_messaging_fd_passing.c index 465ee286879..5030b664116 100644 --- a/source3/torture/test_messaging_fd_passing.c +++ b/source3/torture/test_messaging_fd_passing.c @@ -131,7 +131,7 @@ static bool fdpass2_child(int ready_fd) goto done; } - /* Tell the parent we are ready to receive mesages. */ + /* Tell the parent we are ready to receive messages. */ bytes = write(ready_fd, &c, 1); if (bytes != 1) { perror("child: failed to write to ready_fd"); diff --git a/source3/torture/test_posix.c b/source3/torture/test_posix.c index dc11c62c987..6ce5851d240 100644 --- a/source3/torture/test_posix.c +++ b/source3/torture/test_posix.c @@ -1204,7 +1204,7 @@ bool run_posix_dir_default_acl_test(int dummy) struct security_ace *ace = &sd->dacl->aces[i]; if (ace->flags & (SEC_ACE_FLAG_OBJECT_INHERIT| SEC_ACE_FLAG_CONTAINER_INHERIT)) { - printf("security descritor on directory %s already " + printf("security descriptor on directory %s already " "contains inheritance flags\n", dname); sec_desc_print(NULL, stdout, sd, true); @@ -1284,7 +1284,7 @@ bool run_posix_dir_default_acl_test(int dummy) } if (!got_inherit) { - printf("security descritor on directory %s does not " + printf("security descriptor on directory %s does not " "contain inheritance flags\n", dname); sec_desc_print(NULL, stdout, sd, true); diff --git a/source3/torture/test_smb1_dfs.c b/source3/torture/test_smb1_dfs.c index d1a3f0c2014..c14d207c82a 100644 --- a/source3/torture/test_smb1_dfs.c +++ b/source3/torture/test_smb1_dfs.c @@ -133,7 +133,7 @@ static bool smb1_crtime_matches(struct cli_state *cli, if (!equal) { struct timeval_buf test_buf; struct timeval_buf tomatch_buf; - printf("%s: crtime missmatch " + printf("%s: crtime mismatch " "%s:crtime_tomatch=%s, %s:test_crtime = %s\n", __func__, match_pathname, @@ -2089,7 +2089,7 @@ static NTSTATUS smb1_findfirst(TALLOC_CTX *mem_ctx, 10, /* max returned param */ NULL, /* data */ 0, /* num_data */ - SMB_BUFFER_SIZE_MAX, /* max retured data */ + SMB_BUFFER_SIZE_MAX, /* max returned data */ /* Return values from here on.. */ &recv_flags2, /* recv_flags2 */ NULL, /* rsetup */ @@ -2188,7 +2188,7 @@ static bool test_smb1_findfirst_path(struct cli_state *cli, bool match = strequal_m(finfo[i].name, root_finfo[i].name); if (!match) { - printf("%s:%d Missmatch. For %s, at position %zu, " + printf("%s:%d Mismatch. For %s, at position %zu, " "finfo[i].name = %s, " "root_finfo[i].name = %s\n", __FILE__, @@ -3229,7 +3229,7 @@ static bool test_smb1_open(struct cli_state *cli) } equal = (timespec_compare(&testfile_crtime, &open_crtime) == 0); if (!equal) { - printf("%s:%d crtime missmatch of test file %s\n", + printf("%s:%d crtime mismatch of test file %s\n", __FILE__, __LINE__, "\\BAD\\BAD\\openfile"); @@ -4005,7 +4005,7 @@ static NTSTATUS smb1_qpathinfo(struct cli_state *cli, 2, /* max returned param */ NULL, /* data */ 0, /* num_data */ - SMB_BUFFER_SIZE_MAX, /* max retured data */ + SMB_BUFFER_SIZE_MAX, /* max returned data */ /* Return values from here on.. */ NULL, /* recv_flags2 */ NULL, /* rsetup */ diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index ca8cea23a6b..3cb6d13789a 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -3912,7 +3912,7 @@ static bool smb2_inode_matches(struct cli_state *cli, return false; } if (test_ino != ino_tomatch) { - printf("%s: Inode missmatch, ino_tomatch (%s) " + printf("%s: Inode mismatch, ino_tomatch (%s) " "ino=%"PRIu64" test (%s) " "ino=%"PRIu64"\n", __func__, diff --git a/source3/torture/torture.c b/source3/torture/torture.c index a2db49ea45f..013879eefeb 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -5846,7 +5846,7 @@ static bool run_deletetest(int dummy) fail: /* FIXME: This will crash if we aborted before cli2 got - * intialized, because these functions don't handle + * initialized, because these functions don't handle * uninitialized connections. */ if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1); @@ -9908,7 +9908,7 @@ bool torture_ioctl_test(int dummy) /* - tries varients of chkpath + tries variants of chkpath */ bool torture_chkpath_test(int dummy) { @@ -10073,7 +10073,7 @@ static bool run_eatest(int dummy) } /* Setting EA's to zero length deletes them. Test this */ - printf("Now deleting all EA's - case indepenent....\n"); + printf("Now deleting all EA's - case independent....\n"); #if 1 cli_set_ea_path(cli, fname, "", "", 0); @@ -10176,7 +10176,7 @@ static bool run_dirtest1(int dummy) correct = False; /* Ensure if we have the "must have" bits we only see the - * relevent entries. + * relevant entries. */ num_seen = 0; cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_DIRECTORY<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen); -- 2.47.3