diff options
Diffstat (limited to 'source4/torture/smb2')
-rw-r--r-- | source4/torture/smb2/connect.c | 24 | ||||
-rw-r--r-- | source4/torture/smb2/find.c | 26 | ||||
-rw-r--r-- | source4/torture/smb2/getinfo.c | 24 | ||||
-rw-r--r-- | source4/torture/smb2/lock.c | 18 | ||||
-rw-r--r-- | source4/torture/smb2/notify.c | 16 | ||||
-rw-r--r-- | source4/torture/smb2/scan.c | 36 | ||||
-rw-r--r-- | source4/torture/smb2/setinfo.c | 22 | ||||
-rw-r--r-- | source4/torture/smb2/util.c | 12 |
8 files changed, 89 insertions, 89 deletions
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index c071327419..796b180ddf 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -189,7 +189,7 @@ static struct smb2_handle torture_smb2_create(struct smb2_tree *tree, /* basic testing of SMB2 connection calls */ -BOOL torture_smb2_connect(struct torture_context *torture) +bool torture_smb2_connect(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; @@ -197,7 +197,7 @@ BOOL torture_smb2_connect(struct torture_context *torture) NTSTATUS status; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } h1 = torture_smb2_create(tree, "test9.dat"); @@ -205,56 +205,56 @@ BOOL torture_smb2_connect(struct torture_context *torture) status = torture_smb2_write(tree, h1); if (!NT_STATUS_IS_OK(status)) { printf("Write failed - %s\n", nt_errstr(status)); - return False; + return false; } status = torture_smb2_close(tree, h1); if (!NT_STATUS_IS_OK(status)) { printf("Close failed - %s\n", nt_errstr(status)); - return False; + return false; } status = torture_smb2_close(tree, h2); if (!NT_STATUS_IS_OK(status)) { printf("Close failed - %s\n", nt_errstr(status)); - return False; + return false; } status = smb2_util_close(tree, h1); if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) { printf("close should have closed the handle - %s\n", nt_errstr(status)); - return False; + return false; } status = smb2_tdis(tree); if (!NT_STATUS_IS_OK(status)) { printf("tdis failed - %s\n", nt_errstr(status)); - return False; + return false; } status = smb2_tdis(tree); if (!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_NAME_DELETED)) { printf("tdis should have disabled session - %s\n", nt_errstr(status)); - return False; + return false; } status = smb2_logoff(tree->session); if (!NT_STATUS_IS_OK(status)) { printf("Logoff failed - %s\n", nt_errstr(status)); - return False; + return false; } status = smb2_logoff(tree->session); if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) { printf("Logoff should have disabled session - %s\n", nt_errstr(status)); - return False; + return false; } status = smb2_keepalive(tree->session->transport); if (!NT_STATUS_IS_OK(status)) { printf("keepalive failed? - %s\n", nt_errstr(status)); - return False; + return false; } talloc_free(mem_ctx); - return True; + return true; } diff --git a/source4/torture/smb2/find.c b/source4/torture/smb2/find.c index 2b4bde7865..654866dfb5 100644 --- a/source4/torture/smb2/find.c +++ b/source4/torture/smb2/find.c @@ -49,7 +49,7 @@ static struct { printf("(%s) %s/%s should be 0x%llx - 0x%llx\n", __location__, \ #call_name, #field, \ (long long)io.all_info2.out.field, (long long)d->stype.field); \ - ret = False; \ + ret = false; \ }} while (0) #define CHECK_CONST_STRING(call_name, stype, field, str) do { \ @@ -58,7 +58,7 @@ static struct { printf("(%s) %s/%s should be '%s' - '%s'\n", __location__, \ #call_name, #field, \ str, d->stype.field.s); \ - ret = False; \ + ret = false; \ }} while (0) static union smb_search_data *find_level(const char *name) @@ -75,26 +75,26 @@ static union smb_search_data *find_level(const char *name) /* test find levels */ -static BOOL torture_smb2_find_levels(struct smb2_tree *tree) +static bool torture_smb2_find_levels(struct smb2_tree *tree) { struct smb2_handle handle; NTSTATUS status; int i; struct smb2_find f; - BOOL ret = True; + bool ret = true; union smb_fileinfo io; const char *alt_name; status = smb2_create_complex_file(tree, FNAME, &handle); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } io.generic.level = RAW_FILEINFO_ALT_NAME_INFORMATION; io.generic.in.file.handle = handle; status = smb2_getinfo_file(tree, tree, &io); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } alt_name = talloc_strdup(tree, io.alt_name_info.out.fname.s); @@ -102,12 +102,12 @@ static BOOL torture_smb2_find_levels(struct smb2_tree *tree) io.generic.in.file.handle = handle; status = smb2_getinfo_file(tree, tree, &io); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } status = smb2_util_roothandle(tree, &handle); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } ZERO_STRUCT(f); @@ -130,7 +130,7 @@ static BOOL torture_smb2_find_levels(struct smb2_tree *tree) if (count != 1) { printf("Expected count 1 - got %d in %s\n", count, levels[i].name); - ret = False; + ret = false; } levels[i].data = d[0]; @@ -195,20 +195,20 @@ static BOOL torture_smb2_find_levels(struct smb2_tree *tree) /* basic testing of all SMB2 find levels */ -BOOL torture_smb2_find(struct torture_context *torture) +bool torture_smb2_find(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; - BOOL ret = True; + bool ret = true; NTSTATUS status; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } status = torture_setup_complex_file(tree, FNAME); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } torture_setup_complex_file(tree, FNAME ":streamtwo"); diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index ab7d4e3110..9ed0b9ddb5 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -77,7 +77,7 @@ static struct { /* test fileinfo levels */ -static BOOL torture_smb2_fileinfo(struct smb2_tree *tree) +static bool torture_smb2_fileinfo(struct smb2_tree *tree) { struct smb2_handle hfile, hdir; NTSTATUS status; @@ -131,17 +131,17 @@ static BOOL torture_smb2_fileinfo(struct smb2_tree *tree) } } - return True; + return true; failed: - return False; + return false; } /* test fsinfo levels */ -static BOOL torture_smb2_fsinfo(struct smb2_tree *tree) +static bool torture_smb2_fsinfo(struct smb2_tree *tree) { int i; NTSTATUS status; @@ -151,7 +151,7 @@ static BOOL torture_smb2_fsinfo(struct smb2_tree *tree) status = smb2_util_roothandle(tree, &handle); if (!NT_STATUS_IS_OK(status)) { printf("Unable to create test directory '%s' - %s\n", DNAME, nt_errstr(status)); - return False; + return false; } for (i=0;i<ARRAY_SIZE(fs_levels);i++) { @@ -160,35 +160,35 @@ static BOOL torture_smb2_fsinfo(struct smb2_tree *tree) fs_levels[i].status = smb2_getinfo_fs(tree, tree, &fs_levels[i].info); if (!NT_STATUS_IS_OK(fs_levels[i].status)) { printf("%s failed - %s\n", fs_levels[i].name, nt_errstr(fs_levels[i].status)); - return False; + return false; } } - return True; + return true; } /* basic testing of all SMB2 getinfo levels */ -BOOL torture_smb2_getinfo(struct torture_context *torture) +bool torture_smb2_getinfo(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; - BOOL ret = True; + bool ret = true; NTSTATUS status; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } status = torture_setup_complex_file(tree, FNAME); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } torture_setup_complex_file(tree, FNAME ":streamtwo"); status = torture_setup_complex_dir(tree, DNAME); if (!NT_STATUS_IS_OK(status)) { - return False; + return false; } torture_setup_complex_file(tree, DNAME ":streamtwo"); diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c index 9f426c3aa8..98e412817b 100644 --- a/source4/torture/smb2/lock.c +++ b/source4/torture/smb2/lock.c @@ -32,7 +32,7 @@ if (!NT_STATUS_EQUAL(status, correct)) { \ printf("(%s) Incorrect status %s - should be %s\n", \ __location__, nt_errstr(status), nt_errstr(correct)); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -40,13 +40,13 @@ if ((v) != (correct)) { \ printf("(%s) Incorrect value %s=%d - should be %d\n", \ __location__, #v, v, correct); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) -static BOOL test_valid_request(struct torture_context *torture, struct smb2_tree *tree) +static bool test_valid_request(struct torture_context *torture, struct smb2_tree *tree) { - BOOL ret = True; + bool ret = true; NTSTATUS status; struct smb2_handle h; uint8_t buf[200]; @@ -194,11 +194,11 @@ struct test_lock_read_write_state { NTSTATUS read_h2_status; }; -static BOOL test_lock_read_write(struct torture_context *torture, +static bool test_lock_read_write(struct torture_context *torture, struct smb2_tree *tree, struct test_lock_read_write_state *s) { - BOOL ret = True; + bool ret = true; NTSTATUS status; struct smb2_handle h1, h2; uint8_t buf[200]; @@ -317,7 +317,7 @@ done: return ret; } -static BOOL test_lock_rw_none(struct torture_context *torture, struct smb2_tree *tree) +static bool test_lock_rw_none(struct torture_context *torture, struct smb2_tree *tree) { struct test_lock_read_write_state s = { .fname = "lock_rw_none.dat", @@ -331,7 +331,7 @@ static BOOL test_lock_rw_none(struct torture_context *torture, struct smb2_tree return test_lock_read_write(torture, tree, &s); } -static BOOL test_lock_rw_shared(struct torture_context *torture, struct smb2_tree *tree) +static bool test_lock_rw_shared(struct torture_context *torture, struct smb2_tree *tree) { struct test_lock_read_write_state s = { .fname = "lock_rw_shared.dat", @@ -345,7 +345,7 @@ static BOOL test_lock_rw_shared(struct torture_context *torture, struct smb2_tre return test_lock_read_write(torture, tree, &s); } -static BOOL test_lock_rw_exclusiv(struct torture_context *torture, struct smb2_tree *tree) +static bool test_lock_rw_exclusiv(struct torture_context *torture, struct smb2_tree *tree) { struct test_lock_read_write_state s = { .fname = "lock_rw_exclusiv.dat", diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c index 505b316d8e..cabe81ca71 100644 --- a/source4/torture/smb2/notify.c +++ b/source4/torture/smb2/notify.c @@ -33,7 +33,7 @@ if (!NT_STATUS_EQUAL(status, correct)) { \ printf("(%s) Incorrect status %s - should be %s\n", \ __location__, nt_errstr(status), nt_errstr(correct)); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -41,7 +41,7 @@ if ((v) != (correct)) { \ printf("(%s) Incorrect value %s=%d - should be %d\n", \ __location__, #v, v, correct); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -49,15 +49,15 @@ if (!field.s || strcmp(field.s, value)) { \ printf("(%s) %s [%s] != %s\n", \ __location__, #field, field.s, value); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) #define FNAME "smb2-notify01.dat" -static BOOL test_valid_request(TALLOC_CTX *mem_ctx, struct smb2_tree *tree) +static bool test_valid_request(TALLOC_CTX *mem_ctx, struct smb2_tree *tree) { - BOOL ret = True; + bool ret = true; NTSTATUS status; struct smb2_handle dh; struct smb2_notify n; @@ -188,14 +188,14 @@ done: /* basic testing of SMB2 notify */ -BOOL torture_smb2_notify(struct torture_context *torture) +bool torture_smb2_notify(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; - BOOL ret = True; + bool ret = true; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } ret &= test_valid_request(mem_ctx, tree); diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 83893608f9..f3e4d5cd36 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -35,7 +35,7 @@ /* scan for valid SMB2 getinfo levels */ -BOOL torture_smb2_getinfo_scan(struct torture_context *torture) +bool torture_smb2_getinfo_scan(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; @@ -45,20 +45,20 @@ BOOL torture_smb2_getinfo_scan(struct torture_context *torture) int c, i; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } status = torture_setup_complex_file(tree, FNAME); if (!NT_STATUS_IS_OK(status)) { printf("Failed to setup complex file '%s'\n", FNAME); - return False; + return false; } torture_setup_complex_file(tree, FNAME ":2ndstream"); status = torture_setup_complex_dir(tree, DNAME); if (!NT_STATUS_IS_OK(status)) { printf("Failed to setup complex dir '%s'\n", DNAME); - return False; + return false; } torture_setup_complex_file(tree, DNAME ":2ndstream"); @@ -97,13 +97,13 @@ BOOL torture_smb2_getinfo_scan(struct torture_context *torture) talloc_free(mem_ctx); - return True; + return true; } /* scan for valid SMB2 setinfo levels */ -BOOL torture_smb2_setinfo_scan(struct torture_context *torture) +bool torture_smb2_setinfo_scan(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; @@ -113,13 +113,13 @@ BOOL torture_smb2_setinfo_scan(struct torture_context *torture) int c, i; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } status = torture_setup_complex_file(tree, FNAME); if (!NT_STATUS_IS_OK(status)) { printf("Failed to setup complex file '%s'\n", FNAME); - return False; + return false; } torture_setup_complex_file(tree, FNAME ":2ndstream"); @@ -143,14 +143,14 @@ BOOL torture_smb2_setinfo_scan(struct torture_context *torture) talloc_free(mem_ctx); - return True; + return true; } /* scan for valid SMB2 scan levels */ -BOOL torture_smb2_find_scan(struct torture_context *torture) +bool torture_smb2_find_scan(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; @@ -160,13 +160,13 @@ BOOL torture_smb2_find_scan(struct torture_context *torture) int i; if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } status = smb2_util_roothandle(tree, &handle); if (!NT_STATUS_IS_OK(status)) { printf("Failed to open roothandle - %s\n", nt_errstr(status)); - return False; + return false; } ZERO_STRUCT(io); @@ -191,13 +191,13 @@ BOOL torture_smb2_find_scan(struct torture_context *torture) talloc_free(mem_ctx); - return True; + return true; } /* scan for valid SMB2 opcodes */ -BOOL torture_smb2_scan(struct torture_context *torture) +bool torture_smb2_scan(struct torture_context *torture) { TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_tree *tree; @@ -212,13 +212,13 @@ BOOL torture_smb2_scan(struct torture_context *torture) event_context_find(mem_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("Connection failed - %s\n", nt_errstr(status)); - return False; + return false; } tree->session->transport->options.timeout = 3; for (opcode=0;opcode<1000;opcode++) { - req = smb2_request_init_tree(tree, opcode, 2, False, 0); + req = smb2_request_init_tree(tree, opcode, 2, false, 0); SSVAL(req->out.body, 0, 0); smb2_transport_send(req); if (!smb2_request_receive(req)) { @@ -227,7 +227,7 @@ BOOL torture_smb2_scan(struct torture_context *torture) event_context_find(mem_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("Connection failed - %s\n", nt_errstr(status)); - return False; + return false; } tree->session->transport->options.timeout = 3; } else { @@ -238,5 +238,5 @@ BOOL torture_smb2_scan(struct torture_context *torture) talloc_free(mem_ctx); - return True; + return true; } diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c index 88e8d07604..6a81f13f67 100644 --- a/source4/torture/smb2/setinfo.c +++ b/source4/torture/smb2/setinfo.c @@ -36,10 +36,10 @@ for each call we test that it succeeds, and where possible test for consistency between the calls. */ -BOOL torture_smb2_setinfo(struct torture_context *torture) +bool torture_smb2_setinfo(struct torture_context *torture) { struct smb2_tree *tree; - BOOL ret = True; + bool ret = true; TALLOC_CTX *mem_ctx = talloc_new(NULL); struct smb2_handle handle; char *fname; @@ -60,7 +60,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) fname_new = talloc_asprintf(mem_ctx, BASEDIR "fnum_test_new_%d.txt", n); if (!torture_smb2_connection(mem_ctx, &tree)) { - return False; + return false; } #define RECREATE_FILE(fname) do { \ @@ -69,7 +69,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) if (!NT_STATUS_IS_OK(status)) { \ printf("(%s) ERROR: open of %s failed (%s)\n", \ __location__, fname, nt_errstr(status)); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -87,7 +87,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) if (!NT_STATUS_EQUAL(status, rightstatus)) { \ printf("(%s) %s - %s (should be %s)\n", __location__, #call, \ nt_errstr(status), nt_errstr(rightstatus)); \ - ret = False; \ + ret = false; \ goto done; \ } \ } while (0) @@ -99,7 +99,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) status2 = smb2_getinfo_file(tree, mem_ctx, &finfo2); \ if (!NT_STATUS_IS_OK(status2)) { \ printf("(%s) %s - %s\n", __location__, #call, nt_errstr(status2)); \ - ret = False; \ + ret = false; \ goto done; \ } \ }} while (0) @@ -111,7 +111,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) call_name, #stype, #field, \ (uint_t)value, (uint_t)finfo2.stype.out.field); \ torture_smb2_all_info(tree, handle); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -125,7 +125,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) printf("\t%s", timestring(mem_ctx, value)); \ printf("\t%s\n", nt_time_string(mem_ctx, finfo2.stype.out.field)); \ torture_smb2_all_info(tree, handle); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -133,7 +133,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) if (!NT_STATUS_EQUAL(status, correct)) { \ printf("(%s) Incorrect status %s - should be %s\n", \ __location__, nt_errstr(status), nt_errstr(correct)); \ - ret = False; \ + ret = false; \ goto done; \ }} while (0) @@ -262,7 +262,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) NDR_PRINT_DEBUG(security_descriptor, finfo2.query_secdesc.out.sd); printf("expected:\n"); NDR_PRINT_DEBUG(security_descriptor, sd); - ret = False; + ret = false; } printf("remove it again\n"); @@ -281,7 +281,7 @@ BOOL torture_smb2_setinfo(struct torture_context *torture) NDR_PRINT_DEBUG(security_descriptor, finfo2.query_secdesc.out.sd); printf("expected:\n"); NDR_PRINT_DEBUG(security_descriptor, sd); - ret = False; + ret = false; } done: diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 1852d9a984..705f10a841 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -94,7 +94,7 @@ NTSTATUS smb2_util_write(struct smb2_tree *tree, create a complex file/dir using the SMB2 protocol */ static NTSTATUS smb2_create_complex(struct smb2_tree *tree, const char *fname, - struct smb2_handle *handle, BOOL dir) + struct smb2_handle *handle, bool dir) { TALLOC_CTX *tmp_ctx = talloc_new(tree); char buf[7] = "abc"; @@ -199,7 +199,7 @@ static NTSTATUS smb2_create_complex(struct smb2_tree *tree, const char *fname, NTSTATUS smb2_create_complex_file(struct smb2_tree *tree, const char *fname, struct smb2_handle *handle) { - return smb2_create_complex(tree, fname, handle, False); + return smb2_create_complex(tree, fname, handle, false); } /* @@ -208,7 +208,7 @@ NTSTATUS smb2_create_complex_file(struct smb2_tree *tree, const char *fname, NTSTATUS smb2_create_complex_dir(struct smb2_tree *tree, const char *fname, struct smb2_handle *handle) { - return smb2_create_complex(tree, fname, handle, True); + return smb2_create_complex(tree, fname, handle, true); } /* @@ -302,7 +302,7 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle) /* open a smb2 connection */ -BOOL torture_smb2_connection(TALLOC_CTX *mem_ctx, struct smb2_tree **tree) +bool torture_smb2_connection(TALLOC_CTX *mem_ctx, struct smb2_tree **tree) { NTSTATUS status; const char *host = lp_parm_string(global_loadparm, NULL, "torture", "host"); @@ -314,9 +314,9 @@ BOOL torture_smb2_connection(TALLOC_CTX *mem_ctx, struct smb2_tree **tree) if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n", host, share, nt_errstr(status)); - return False; + return false; } - return True; + return true; } |