From 754d416ea54e1e520aa035a759ec8e3975ab5354 Mon Sep 17 00:00:00 2001 From: James Peach Date: Mon, 5 Mar 2007 22:26:38 +0000 Subject: r21710: Add client support for the UNIX_INFO2 info level in the QueryFile, QueryPath and FindFirst calls. Add a new torture test to verify the server side. (This used to be commit 7f56da2d1fa0718e5282bb4aea7d9a63a62f0bc7) --- source4/torture/unix/unix_info2.c | 457 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 457 insertions(+) create mode 100644 source4/torture/unix/unix_info2.c (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c new file mode 100644 index 0000000000..66ec96bfd9 --- /dev/null +++ b/source4/torture/unix/unix_info2.c @@ -0,0 +1,457 @@ +/* + Test the SMB_QUERY_FILE_UNIX_INFO2 Unix extension. + + Copyright (C) 2007 James Peach + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" +#include "libcli/libcli.h" +#include "libcli/raw/interfaces.h" +#include "libcli/raw/raw_proto.h" +#include "torture/torture.h" +#include "torture/util.h" +#include "torture/basic/proto.h" +#include "lib/cmdline/popt_common.h" +#include "auth/credentials/credentials.h" + +struct unix_info2 { + uint64_t end_of_file; + uint64_t num_bytes; + NTTIME status_change_time; + NTTIME access_time; + NTTIME change_time; + uint64_t uid; + uint64_t gid; + uint32_t file_type; + uint64_t dev_major; + uint64_t dev_minor; + uint64_t unique_id; + uint64_t permissions; + uint64_t nlink; + NTTIME create_time; + uint32_t file_flags; + uint32_t flags_mask; +}; + +static struct smbcli_state *connect_to_server(void *mem_ctx) +{ + NTSTATUS status; + struct smbcli_state *cli; + + const char *host = lp_parm_string(-1, "torture", "host"); + const char *share = lp_parm_string(-1, "torture", "share"); + + status = smbcli_full_connection(mem_ctx, &cli, + host, share, NULL, + cmdline_credentials, NULL); + + if (!NT_STATUS_IS_OK(status)) { + printf("failed to connect to //%s/%s: %s\n", + host, share, nt_errstr(status)); + return NULL; + } + + return cli; +} + +static BOOL check_unix_info2(struct torture_context *torture, + struct unix_info2 *info2) +{ + printf("\tcreate_time=0x%016llu flags=0x%08x mask=0x%08x\n", + (unsigned long long)info2->create_time, + info2->file_flags, info2->flags_mask); + + if (info2->file_flags == 0) { + return True; + } + + /* If we have any file_flags set, they must be within the range + * defined by flags_mask. + */ + if ((info2->flags_mask & info2->file_flags) == 0) { + torture_result(torture, TORTURE_FAIL, + __location__"%s: UNIX_INFO2 flags field 0x%08x, " + "does not match mask 0x%08x\n", + info2->file_flags, info2->flags_mask); + } + + return True; +} + +static NTSTATUS set_path_info2(void *mem_ctx, + struct smbcli_state *cli, + const char *fname, + struct unix_info2 *info2) +{ + union smb_setfileinfo sfinfo; + + sfinfo.generic.level = RAW_SFILEINFO_UNIX_INFO2; + sfinfo.generic.in.file.path = fname; + + sfinfo.unix_info2.in.end_of_file = info2->end_of_file; + sfinfo.unix_info2.in.num_bytes = info2->num_bytes; + sfinfo.unix_info2.in.status_change_time = info2->status_change_time; + sfinfo.unix_info2.in.access_time = info2->access_time; + sfinfo.unix_info2.in.change_time = info2->change_time; + sfinfo.unix_info2.in.uid = info2->uid; + sfinfo.unix_info2.in.gid = info2->gid; + sfinfo.unix_info2.in.file_type = info2->file_type; + sfinfo.unix_info2.in.dev_major = info2->dev_major; + sfinfo.unix_info2.in.dev_minor = info2->dev_minor; + sfinfo.unix_info2.in.unique_id = info2->unique_id; + sfinfo.unix_info2.in.permissions = info2->permissions; + sfinfo.unix_info2.in.nlink = info2->nlink; + sfinfo.unix_info2.in.create_time = info2->create_time; + sfinfo.unix_info2.in.file_flags = info2->file_flags; + sfinfo.unix_info2.in.flags_mask = info2->flags_mask; + + return smb_raw_setpathinfo(cli->tree, &sfinfo); +} + +static BOOL query_file_path_info2(void *mem_ctx, + struct torture_context *torture, + struct smbcli_state *cli, + int fnum, + const char *fname, + struct unix_info2 *info2) +{ + NTSTATUS result; + union smb_fileinfo finfo; + + finfo.generic.level = RAW_FILEINFO_UNIX_INFO2; + + if (fname) { + finfo.generic.in.file.path = fname; + result = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); + } else { + finfo.generic.in.file.fnum = fnum; + result = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo); + } + + torture_assert_ntstatus_equal(torture, result, NT_STATUS_OK, + smbcli_errstr(cli->tree)); + + info2->end_of_file = finfo.unix_info2.out.end_of_file; + info2->num_bytes = finfo.unix_info2.out.num_bytes; + info2->status_change_time = finfo.unix_info2.out.status_change_time; + info2->access_time = finfo.unix_info2.out.access_time; + info2->change_time = finfo.unix_info2.out.change_time; + info2->uid = finfo.unix_info2.out.uid; + info2->gid = finfo.unix_info2.out.gid; + info2->file_type = finfo.unix_info2.out.file_type; + info2->dev_major = finfo.unix_info2.out.dev_major; + info2->dev_minor = finfo.unix_info2.out.dev_minor; + info2->unique_id = finfo.unix_info2.out.unique_id; + info2->permissions = finfo.unix_info2.out.permissions; + info2->nlink = finfo.unix_info2.out.nlink; + info2->create_time = finfo.unix_info2.out.create_time; + info2->file_flags = finfo.unix_info2.out.file_flags; + info2->flags_mask = finfo.unix_info2.out.flags_mask; + + if (!check_unix_info2(torture, info2)) { + return False; + } + + return True; +} + +static BOOL query_file_info2(void *mem_ctx, + struct torture_context *torture, + struct smbcli_state *cli, + int fnum, + struct unix_info2 *info2) +{ + return query_file_path_info2(mem_ctx, torture, cli, + fnum, NULL, info2); +} + +static BOOL query_path_info2(void *mem_ctx, + struct torture_context *torture, + struct smbcli_state *cli, + const char *fname, + struct unix_info2 *info2) +{ + return query_file_path_info2(mem_ctx, torture, cli, + -1, fname, info2); +} + +static BOOL search_callback(void *private, const union smb_search_data *fdata) +{ + struct unix_info2 *info2 = (struct unix_info2 *)private; + + info2->end_of_file = fdata->unix_info2.end_of_file; + info2->num_bytes = fdata->unix_info2.num_bytes; + info2->status_change_time = fdata->unix_info2.status_change_time; + info2->access_time = fdata->unix_info2.access_time; + info2->change_time = fdata->unix_info2.change_time; + info2->uid = fdata->unix_info2.uid; + info2->gid = fdata->unix_info2.gid; + info2->file_type = fdata->unix_info2.file_type; + info2->dev_major = fdata->unix_info2.dev_major; + info2->dev_minor = fdata->unix_info2.dev_minor; + info2->unique_id = fdata->unix_info2.unique_id; + info2->permissions = fdata->unix_info2.permissions; + info2->nlink = fdata->unix_info2.nlink; + info2->create_time = fdata->unix_info2.create_time; + info2->file_flags = fdata->unix_info2.file_flags; + info2->flags_mask = fdata->unix_info2.flags_mask; + + return True; +} + +static BOOL find_single_info2(void *mem_ctx, + struct torture_context *torture, + struct smbcli_state *cli, + const char *fname, + struct unix_info2 *info2) +{ + union smb_search_first search; + NTSTATUS status; + + /* Set up a new search for a single item, not using resume keys. */ + ZERO_STRUCT(search); + search.t2ffirst.level = RAW_SEARCH_TRANS2; + search.t2ffirst.data_level = SMB_FIND_UNIX_INFO2; + search.t2ffirst.in.max_count = 1; + search.t2ffirst.in.flags = FLAG_TRANS2_FIND_CLOSE; + search.t2ffirst.in.pattern = fname; + + status = smb_raw_search_first(cli->tree, mem_ctx, + &search, info2, search_callback); + torture_assert_ntstatus_equal(torture, status, NT_STATUS_OK, + smbcli_errstr(cli->tree)); + + torture_assert_int_equal(torture, search.t2ffirst.out.count, 1, + "expected exactly one result"); + torture_assert_int_equal(torture, search.t2ffirst.out.end_of_search, 1, + "expected end_of_search to be true"); + + return check_unix_info2(torture, info2); +} + +#define ASSERT_FLAGS_MATCH(info2, expected) \ + if ((info2)->file_flags != (1 << i)) { \ + torture_result(torture, TORTURE_FAIL, \ + __location__": INFO2 flags field was 0x%08x, "\ + "expected 0x%08x\n",\ + (info2)->file_flags, expected); \ + } + +static void set_no_metadata_change(struct unix_info2 *info2) +{ + info2->uid = SMB_UID_NO_CHANGE; + info2->gid = SMB_GID_NO_CHANGE; + info2->permissions = SMB_MODE_NO_CHANGE; + + info2->end_of_file = + ((uint64_t)SMB_SIZE_NO_CHANGE_HI << 32) | SMB_SIZE_NO_CHANGE_LO; + + info2->status_change_time = + info2->access_time = + info2->change_time = + info2->create_time = + ((uint64_t)SMB_SIZE_NO_CHANGE_HI << 32) | SMB_SIZE_NO_CHANGE_LO; +} + +static BOOL verify_setinfo_flags(void *mem_ctx, + struct torture_context *torture, + struct smbcli_state *cli, + const char *fname) +{ + struct unix_info2 info2; + uint32_t smb_fmask; + int i; + + BOOL ret = True; + NTSTATUS status; + + if (!query_path_info2(mem_ctx, torture, cli, fname, &info2)) { + return False; + } + + smb_fmask = info2.flags_mask; + + /* For each possible flag, ask to set exactly 1 flag, making sure + * that flag is in our requested mask. + */ + for (i = 0; i < 32; ++i) { + info2.file_flags = (1 << i); + info2.flags_mask = smb_fmask | info2.file_flags; + + set_no_metadata_change(&info2); + status = set_path_info2(mem_ctx, cli, fname, &info2); + + if (info2.file_flags & smb_fmask) { + torture_assert_ntstatus_equal(torture, + status, NT_STATUS_OK, + "setting UNIX_INFO2 flags"); + + if (!query_path_info2(mem_ctx, torture, cli, + fname, &info2)) { + return False; + } + + ASSERT_FLAGS_MATCH(&info2, 1 << i); + + + } else { + /* We tried to set a flag the server doesn't + * understand. + */ + torture_assert_ntstatus_equal(torture, + status, NT_STATUS_INVALID_PARAMETER, + "setting UNIX_INFO2 flags"); + } + } + + /* Make sure that a zero flags field does nothing. */ + set_no_metadata_change(&info2); + info2.file_flags = 0xFFFFFFFF; + info2.flags_mask = 0; + status = set_path_info2(mem_ctx, cli, fname, &info2); + torture_assert_ntstatus_equal(torture, status, NT_STATUS_OK, + "setting empty flags mask"); + + return ret; + +} + +static int create_file(struct smbcli_state *cli, const char * fname) +{ + + return smbcli_nt_create_full(cli->tree, fname, 0, + SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL, + NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, + 0, 0); +} + +static BOOL match_info2(struct torture_context *torture, + const struct unix_info2 *pinfo, + const struct unix_info2 *finfo) +{ + printf("checking results match\n"); + + torture_assert_u64_equal(torture, finfo->end_of_file, 0, + "end_of_file should be 0"); + torture_assert_u64_equal(torture, finfo->num_bytes, 0, + "num_bytes should be 0"); + + torture_assert_u64_equal(torture, finfo->end_of_file, + pinfo->end_of_file, "end_of_file mismatch"); + torture_assert_u64_equal(torture, finfo->num_bytes, pinfo->num_bytes, + "num_bytes mismatch"); + + /* Don't match access_time. */ + + torture_assert_u64_equal(torture, finfo->status_change_time, + pinfo->status_change_time, + "status_change_time mismatch"); + torture_assert_u64_equal(torture, finfo->change_time, + pinfo->change_time, "change_time mismatch"); + + torture_assert_u64_equal(torture, finfo->uid, pinfo->uid, + "UID mismatch"); + torture_assert_u64_equal(torture, finfo->gid, pinfo->gid, + "GID mismatch"); + torture_assert_int_equal(torture, finfo->file_type, pinfo->file_type, + "file_type mismatch"); + torture_assert_u64_equal(torture, finfo->dev_major, pinfo->dev_major, + "dev_major mismatch"); + torture_assert_u64_equal(torture, finfo->dev_minor, pinfo->dev_minor, + "dev_minor mismatch"); + torture_assert_u64_equal(torture, finfo->unique_id, pinfo->unique_id, + "unique_id mismatch"); + torture_assert_u64_equal(torture, finfo->permissions, + pinfo->permissions, "permissions mismatch"); + torture_assert_u64_equal(torture, finfo->nlink, pinfo->nlink, + "nlink mismatch"); + torture_assert_u64_equal(torture, finfo->create_time, pinfo->create_time, + "create_time mismatch"); + + return True; +} + + +#define FILENAME "\\smb_unix_info2.txt" + +BOOL unix_torture_unix_info2(struct torture_context *torture) +{ + void *mem_ctx; + struct smbcli_state *cli; + int fnum; + + struct unix_info2 pinfo, finfo; + + mem_ctx = talloc_init("smb_query_unix_info2"); + torture_assert(torture, mem_ctx != NULL, "out of memory"); + + if (!(cli = connect_to_server(mem_ctx))) { + talloc_free(mem_ctx); + return False; + } + + smbcli_unlink(cli->tree, FILENAME); + + fnum = create_file(cli, FILENAME); + torture_assert(torture, fnum != -1, smbcli_errstr(cli->tree)); + + printf("checking SMB_QFILEINFO_UNIX_INFO2 for QueryFileInfo\n"); + if (!query_file_info2(mem_ctx, torture, cli, fnum, &finfo)) { + goto fail; + } + + printf("checking SMB_QFILEINFO_UNIX_INFO2 for QueryPathInfo\n"); + if (!query_path_info2(mem_ctx, torture, cli, FILENAME, &pinfo)) { + goto fail; + } + + if (!match_info2(torture, &pinfo, &finfo)) { + goto fail; + } + + printf("checking SMB_FIND_UNIX_INFO2 for FindFirst\n"); + if (!find_single_info2(mem_ctx, torture, cli, FILENAME, &pinfo)) { + goto fail; + } + + if (!match_info2(torture, &pinfo, &finfo)) { + goto fail; + } + + /* XXX: should repeat this test with SetFileInfo. */ + printf("checking SMB_SFILEINFO_UNIX_INFO2 for SetPathInfo\n"); + if (!verify_setinfo_flags(mem_ctx, torture, cli, FILENAME)) { + goto fail; + } + + smbcli_close(cli->tree, fnum); + smbcli_unlink(cli->tree, FILENAME); + torture_close_connection(cli); + talloc_free(mem_ctx); + return True; + +fail: + + smbcli_close(cli->tree, fnum); + smbcli_unlink(cli->tree, FILENAME); + torture_close_connection(cli); + talloc_free(mem_ctx); + return False; + +} + +/* vim: set sts=8 sw=8 : */ -- cgit From c61db93c7e2d46ac0fd1a0f98199c111fd416a9b Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 23 Mar 2007 19:24:21 +0000 Subject: r21949: After discussion with the Apple and Linux client maintainers, changing the FindFirst response for the UNIX_INFO2 level to include a length field before the name. The name is not required to be null terminated. the lenght field does not count any null. (This used to be commit eef672bfff6b112ceceec2a58c78042352e83276) --- source4/torture/unix/unix_info2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 66ec96bfd9..8c642c1d8d 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -298,7 +298,7 @@ static BOOL verify_setinfo_flags(void *mem_ctx, if (info2.file_flags & smb_fmask) { torture_assert_ntstatus_equal(torture, status, NT_STATUS_OK, - "setting UNIX_INFO2 flags"); + "setting valid UNIX_INFO2 flag"); if (!query_path_info2(mem_ctx, torture, cli, fname, &info2)) { @@ -314,7 +314,7 @@ static BOOL verify_setinfo_flags(void *mem_ctx, */ torture_assert_ntstatus_equal(torture, status, NT_STATUS_INVALID_PARAMETER, - "setting UNIX_INFO2 flags"); + "setting invalid UNIX_INFO2 flag"); } } -- cgit From 90d8786d051f79ca100a211640b1bf9c737ec358 Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 23 Mar 2007 20:28:45 +0000 Subject: r21951: Hopefully fix valgrind warning. (This used to be commit e5d0487f3196da4e5aa79a6f285b3f3d23d303ca) --- source4/torture/unix/unix_info2.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 8c642c1d8d..9bbeddb4a3 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -99,6 +99,7 @@ static NTSTATUS set_path_info2(void *mem_ctx, { union smb_setfileinfo sfinfo; + ZERO_STRUCT(sfinfo.basic_info.in); sfinfo.generic.level = RAW_SFILEINFO_UNIX_INFO2; sfinfo.generic.in.file.path = fname; -- cgit From 714b5df833c88563c2d010d195880cfcec0bfbfe Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Apr 2007 10:35:21 +0000 Subject: r22188: fix formating bug metze (This used to be commit e40912a2fd011351c6f0e7112f2984763bc53cb6) --- source4/torture/unix/unix_info2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 9bbeddb4a3..64b7613df3 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -84,7 +84,7 @@ static BOOL check_unix_info2(struct torture_context *torture, */ if ((info2->flags_mask & info2->file_flags) == 0) { torture_result(torture, TORTURE_FAIL, - __location__"%s: UNIX_INFO2 flags field 0x%08x, " + __location__": UNIX_INFO2 flags field 0x%08x, " "does not match mask 0x%08x\n", info2->file_flags, info2->flags_mask); } -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/torture/unix/unix_info2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 64b7613df3..4c47179099 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -5,7 +5,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ #include "includes.h" -- cgit From 2fefa818a95138fc7d6508093f426cb4ed92138f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 28 Aug 2007 00:16:58 +0000 Subject: r24728: Use more stock torture functions. (This used to be commit da3a7ee407a2b41bd01f45072cad12bf29250b33) --- source4/torture/unix/unix_info2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 4c47179099..1e063fbe8f 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -46,15 +46,15 @@ struct unix_info2 { uint32_t flags_mask; }; -static struct smbcli_state *connect_to_server(void *mem_ctx) +static struct smbcli_state *connect_to_server(struct torture_context *tctx) { NTSTATUS status; struct smbcli_state *cli; - const char *host = lp_parm_string(-1, "torture", "host"); - const char *share = lp_parm_string(-1, "torture", "share"); + const char *host = torture_setting_string(tctx, "host", NULL); + const char *share = torture_setting_string(tctx, "share", NULL); - status = smbcli_full_connection(mem_ctx, &cli, + status = smbcli_full_connection(tctx, &cli, host, share, NULL, cmdline_credentials, NULL); @@ -399,7 +399,7 @@ BOOL unix_torture_unix_info2(struct torture_context *torture) mem_ctx = talloc_init("smb_query_unix_info2"); torture_assert(torture, mem_ctx != NULL, "out of memory"); - if (!(cli = connect_to_server(mem_ctx))) { + if (!(cli = connect_to_server(torture))) { talloc_free(mem_ctx); return False; } -- cgit From 2151cde58014ea2e822c13d2f8a369b45dc19ca8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 6 Oct 2007 22:28:14 +0000 Subject: r25554: Convert last instances of BOOL, True and False to the standard types. (This used to be commit 566aa14139510788548a874e9213d91317f83ca9) --- source4/torture/unix/unix_info2.c | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 1e063fbe8f..882dc7a084 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -67,7 +67,7 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx) return cli; } -static BOOL check_unix_info2(struct torture_context *torture, +static bool check_unix_info2(struct torture_context *torture, struct unix_info2 *info2) { printf("\tcreate_time=0x%016llu flags=0x%08x mask=0x%08x\n", @@ -75,7 +75,7 @@ static BOOL check_unix_info2(struct torture_context *torture, info2->file_flags, info2->flags_mask); if (info2->file_flags == 0) { - return True; + return true; } /* If we have any file_flags set, they must be within the range @@ -88,7 +88,7 @@ static BOOL check_unix_info2(struct torture_context *torture, info2->file_flags, info2->flags_mask); } - return True; + return true; } static NTSTATUS set_path_info2(void *mem_ctx, @@ -122,7 +122,7 @@ static NTSTATUS set_path_info2(void *mem_ctx, return smb_raw_setpathinfo(cli->tree, &sfinfo); } -static BOOL query_file_path_info2(void *mem_ctx, +static bool query_file_path_info2(void *mem_ctx, struct torture_context *torture, struct smbcli_state *cli, int fnum, @@ -163,13 +163,13 @@ static BOOL query_file_path_info2(void *mem_ctx, info2->flags_mask = finfo.unix_info2.out.flags_mask; if (!check_unix_info2(torture, info2)) { - return False; + return false; } - return True; + return true; } -static BOOL query_file_info2(void *mem_ctx, +static bool query_file_info2(void *mem_ctx, struct torture_context *torture, struct smbcli_state *cli, int fnum, @@ -179,7 +179,7 @@ static BOOL query_file_info2(void *mem_ctx, fnum, NULL, info2); } -static BOOL query_path_info2(void *mem_ctx, +static bool query_path_info2(void *mem_ctx, struct torture_context *torture, struct smbcli_state *cli, const char *fname, @@ -189,7 +189,7 @@ static BOOL query_path_info2(void *mem_ctx, -1, fname, info2); } -static BOOL search_callback(void *private, const union smb_search_data *fdata) +static bool search_callback(void *private, const union smb_search_data *fdata) { struct unix_info2 *info2 = (struct unix_info2 *)private; @@ -210,10 +210,10 @@ static BOOL search_callback(void *private, const union smb_search_data *fdata) info2->file_flags = fdata->unix_info2.file_flags; info2->flags_mask = fdata->unix_info2.flags_mask; - return True; + return true; } -static BOOL find_single_info2(void *mem_ctx, +static bool find_single_info2(void *mem_ctx, struct torture_context *torture, struct smbcli_state *cli, const char *fname, @@ -267,7 +267,7 @@ static void set_no_metadata_change(struct unix_info2 *info2) ((uint64_t)SMB_SIZE_NO_CHANGE_HI << 32) | SMB_SIZE_NO_CHANGE_LO; } -static BOOL verify_setinfo_flags(void *mem_ctx, +static bool verify_setinfo_flags(void *mem_ctx, struct torture_context *torture, struct smbcli_state *cli, const char *fname) @@ -276,11 +276,11 @@ static BOOL verify_setinfo_flags(void *mem_ctx, uint32_t smb_fmask; int i; - BOOL ret = True; + bool ret = true; NTSTATUS status; if (!query_path_info2(mem_ctx, torture, cli, fname, &info2)) { - return False; + return false; } smb_fmask = info2.flags_mask; @@ -302,7 +302,7 @@ static BOOL verify_setinfo_flags(void *mem_ctx, if (!query_path_info2(mem_ctx, torture, cli, fname, &info2)) { - return False; + return false; } ASSERT_FLAGS_MATCH(&info2, 1 << i); @@ -339,7 +339,7 @@ static int create_file(struct smbcli_state *cli, const char * fname) 0, 0); } -static BOOL match_info2(struct torture_context *torture, +static bool match_info2(struct torture_context *torture, const struct unix_info2 *pinfo, const struct unix_info2 *finfo) { @@ -382,13 +382,13 @@ static BOOL match_info2(struct torture_context *torture, torture_assert_u64_equal(torture, finfo->create_time, pinfo->create_time, "create_time mismatch"); - return True; + return true; } #define FILENAME "\\smb_unix_info2.txt" -BOOL unix_torture_unix_info2(struct torture_context *torture) +bool unix_torture_unix_info2(struct torture_context *torture) { void *mem_ctx; struct smbcli_state *cli; @@ -401,7 +401,7 @@ BOOL unix_torture_unix_info2(struct torture_context *torture) if (!(cli = connect_to_server(torture))) { talloc_free(mem_ctx); - return False; + return false; } smbcli_unlink(cli->tree, FILENAME); @@ -442,7 +442,7 @@ BOOL unix_torture_unix_info2(struct torture_context *torture) smbcli_unlink(cli->tree, FILENAME); torture_close_connection(cli); talloc_free(mem_ctx); - return True; + return true; fail: @@ -450,7 +450,7 @@ fail: smbcli_unlink(cli->tree, FILENAME); torture_close_connection(cli); talloc_free(mem_ctx); - return False; + return false; } -- cgit From 4b0199a5493ea2b88558cc40871e63c1dc8dbb56 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 12 Dec 2007 02:15:29 +0100 Subject: r26409: Pass smb ports along. (This used to be commit 2833f320de1f1fd39c710ad0a61c3fa1bb1df31f) --- source4/torture/unix/unix_info2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 882dc7a084..d5fe8bc260 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -26,6 +26,7 @@ #include "torture/basic/proto.h" #include "lib/cmdline/popt_common.h" #include "auth/credentials/credentials.h" +#include "param/param.h" struct unix_info2 { uint64_t end_of_file; @@ -54,8 +55,9 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx) const char *host = torture_setting_string(tctx, "host", NULL); const char *share = torture_setting_string(tctx, "share", NULL); - status = smbcli_full_connection(tctx, &cli, - host, share, NULL, + status = smbcli_full_connection(tctx, &cli, host, + lp_smb_ports(tctx->lp_ctx), + share, NULL, cmdline_credentials, NULL); if (!NT_STATUS_IS_OK(status)) { -- cgit From 771b347f9b185895390445be96081c781e28a26d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 2 Jan 2008 18:39:01 -0600 Subject: r26644: Janitorial: Pass resolve_context explicitly to various SMB functions, should help fix the build for OpenChange. (This used to be commit 385ffe4f4cc9a21a760c0f00410f56e2592fd507) --- source4/torture/unix/unix_info2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index d5fe8bc260..9fa0d55c9e 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -26,6 +26,7 @@ #include "torture/basic/proto.h" #include "lib/cmdline/popt_common.h" #include "auth/credentials/credentials.h" +#include "libcli/resolve/resolve.h" #include "param/param.h" struct unix_info2 { @@ -58,7 +59,8 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx) status = smbcli_full_connection(tctx, &cli, host, lp_smb_ports(tctx->lp_ctx), share, NULL, - cmdline_credentials, NULL); + cmdline_credentials, + lp_resolve_context(tctx->lp_ctx), NULL); if (!NT_STATUS_IS_OK(status)) { printf("failed to connect to //%s/%s: %s\n", -- cgit From dcc282590b34537fc1ead61c3300172528273b44 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 3 Jan 2008 17:22:12 -0600 Subject: r26654: libcli/smb_composite: Rather than specifying each of the gazillion options for SMB individually, just specify the smbcli_options struct. (This used to be commit 8a97886e24a4b969aa91409c06f423b71a45f6eb) --- source4/torture/unix/unix_info2.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 9fa0d55c9e..c14be9e2d0 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -55,12 +55,16 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx) const char *host = torture_setting_string(tctx, "host", NULL); const char *share = torture_setting_string(tctx, "share", NULL); + struct smbcli_options options; + + lp_smbcli_options(tctx->lp_ctx, &options); status = smbcli_full_connection(tctx, &cli, host, lp_smb_ports(tctx->lp_ctx), share, NULL, cmdline_credentials, - lp_resolve_context(tctx->lp_ctx), NULL); + lp_resolve_context(tctx->lp_ctx), NULL, + &options); if (!NT_STATUS_IS_OK(status)) { printf("failed to connect to //%s/%s: %s\n", -- cgit From 4e83011f72ba3df387512755a17760b42a7bf2f2 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 21 Apr 2008 17:58:23 -0400 Subject: Remove more event_context_init() uses from function calls within deep down the code. Make sure we pass around the event_context where we need it instead. All test but a few python ones fail. Jelmer promised to fix them. (This used to be commit 3045d391626fba169aa26be52174883e18d323e9) --- source4/torture/unix/unix_info2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/torture/unix/unix_info2.c') diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index c14be9e2d0..d7482ddcf1 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -63,8 +63,8 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx) lp_smb_ports(tctx->lp_ctx), share, NULL, cmdline_credentials, - lp_resolve_context(tctx->lp_ctx), NULL, - &options); + lp_resolve_context(tctx->lp_ctx), + tctx->ev, &options); if (!NT_STATUS_IS_OK(status)) { printf("failed to connect to //%s/%s: %s\n", -- cgit