From 7dd22bdb476e7565a755bf44040ed505d84e07a9 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 11 Jun 2012 17:58:02 +0200 Subject: s4:torture: fix use of non-existent word (existant) --- source4/torture/raw/lookuprate.c | 2 +- source4/torture/raw/notify.c | 4 ++-- source4/torture/raw/open.c | 4 ++-- source4/torture/raw/streams.c | 6 +++--- source4/torture/raw/unlink.c | 2 +- source4/torture/rpc/samr.c | 2 +- source4/torture/smb2/notify.c | 4 ++-- source4/torture/smb2/streams.c | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c index 3b9fbe1cdb..7c0251a0f7 100644 --- a/source4/torture/raw/lookuprate.c +++ b/source4/torture/raw/lookuprate.c @@ -225,7 +225,7 @@ static bool remove_working_directory(struct smbcli_tree *tree, /* Verify that looking up a file name takes constant time. * - * This test samples the lookup rate for a non-existant filename in a + * This test samples the lookup rate for a non-existent filename in a * directory, while varying the number of files in the directory. The * lookup rate should continue to approximate the lookup rate for the * empty directory case. diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index 2a16d6ee3c..d9253f0353 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -189,7 +189,7 @@ static bool test_notify_dir(struct torture_context *mem_ctx, notify.nttrans.in.file.fnum = fnum; req = smb_raw_changenotify_send(cli->tree, ¬ify); - status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt"); + status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistent.txt"); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); /* (1st unlink) as the 2nd notify directly returns, @@ -219,7 +219,7 @@ static bool test_notify_dir(struct torture_context *mem_ctx, printf("(3rd notify) this notify will only see the 1st unlink\n"); req = smb_raw_changenotify_send(cli->tree, ¬ify); - status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt"); + status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistent.txt"); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); printf("Testing notify on wildcard unlink for %d files\n", count-1); diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 21cc32eb09..145651b41d 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -1703,7 +1703,7 @@ static bool test_chained_ntcreatex_readx(struct torture_context *tctx, struct sm torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); torture_comment(tctx, "Checking RAW_NTCREATEX_READX chained on " - "non-existant file \n"); + "non-existent file \n"); /* ntcreatex parameters */ io.generic.level = RAW_OPEN_NTCREATEX_READX; @@ -1727,7 +1727,7 @@ static bool test_chained_ntcreatex_readx(struct torture_context *tctx, struct sm io.ntcreatexreadx.in.remaining = 0; io.ntcreatexreadx.out.data = (uint8_t *)buf2; - /* try to open the non-existant file */ + /* try to open the non-existent file */ status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); fnum = io.ntcreatexreadx.out.file.fnum; diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index 2aace2bd35..d48c555d22 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -203,7 +203,7 @@ static bool test_stream_dir(struct torture_context *tctx, basedir_data = talloc_asprintf(tctx, "%s::$DATA", BASEDIR); sname1 = talloc_asprintf(tctx, "%s:%s", fname, "Stream One"); - printf("(%s) opening non-existant directory stream\n", __location__); + printf("(%s) opening non-existent directory stream\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; @@ -282,7 +282,7 @@ static bool test_stream_io(struct torture_context *tctx, sname1 = talloc_asprintf(tctx, "%s:%s", fname, "Stream One"); sname2 = talloc_asprintf(tctx, "%s:%s:$DaTa", fname, "Second Stream"); - printf("(%s) creating a stream on a non-existant file\n", __location__); + printf("(%s) creating a stream on a non-existent file\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; @@ -509,7 +509,7 @@ static bool test_stream_delete(struct torture_context *tctx, sname1 = talloc_asprintf(tctx, "%s:%s", fname, "Stream One"); - printf("(%s) opening non-existant file stream\n", __location__); + printf("(%s) opening non-existent file stream\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index 4ca5406793..25edb5e045 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -48,7 +48,7 @@ static bool test_unlink(struct torture_context *tctx, struct smbcli_state *cli) torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); - printf("Trying non-existant file\n"); + printf("Trying non-existent file\n"); io.unlink.in.pattern = fname; io.unlink.in.attrib = 0; status = smb_raw_unlink(cli->tree, &io); diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index bf1d713eed..a460211e81 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -7950,7 +7950,7 @@ static bool test_samr_ValidatePassword(struct dcerpc_pipe *p, r.out.rep = &repp; ZERO_STRUCT(req); - req.req3.account.string = "non-existant-account-aklsdji"; + req.req3.account.string = "non-existent-account-aklsdji"; for (i=0; passwords[i]; i++) { req.req3.password.string = passwords[i]; diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c index e4e26365e3..7a4e5622d2 100644 --- a/source4/torture/smb2/notify.c +++ b/source4/torture/smb2/notify.c @@ -367,7 +367,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, notify.smb2.in.file.handle = h1; req = smb2_notify_send(tree1, &(notify.smb2)); - status = smb2_util_unlink(tree1, BASEDIR "\\nonexistant.txt"); + status = smb2_util_unlink(tree1, BASEDIR "\\nonexistent.txt"); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); /* (1st unlink) as the 2nd notify directly returns, @@ -400,7 +400,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture, "(3rd notify) this notify will only see the 1st unlink\n"); req = smb2_notify_send(tree1, &(notify.smb2)); - status = smb2_util_unlink(tree1, BASEDIR "\\nonexistant.txt"); + status = smb2_util_unlink(tree1, BASEDIR "\\nonexistent.txt"); CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND); for (i=1;i