sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-14 01:57:53 +03:00
Code
124,048 Commits 62 Branches 1,151 Tags
Commit Graph

56072 Commits

Author SHA1 Message Date
Ralph Boehme
b133b81d8d smbd: avoid using dirfsp arg in create_file_default() 
This is not used anymore in the callees.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:44 +00:00
Ralph Boehme
a366b756a1 vfs_fruit: avoid using fsp->dirsp 
fsp->dirfsp will eventually go away again.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:44 +00:00
Ralph Boehme
9d84a2356b smbd: remove dirfsp arg from create_file_unixpath() 
Prepares for removing the dirfsp arg from SMB_VFS_CREATE_FILE() again. In the
future dirfsp has to opened as needed within create_file_unixpath() and below.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:44 +00:00
Ralph Boehme
a754466181 smbd: remove dirsp arg from open_directory() 
Prepares for removing the dirfsp arg from SMB_VFS_CREATE_FILE() again. In the
future open_directory() will open the dirfsp itself.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
7ccaff4857 smbd: remove dirfsp arg from mkdir_internal() 
Prepares for removing the dirfsp arg from SMB_VFS_CREATE_FILE() again. In the
future mkdir_internal() will open the dirfsp itself as needed.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
d196cf4604 vfs_fruit: use VFS ftruncate function in fruit_ftruncate_rsrc_adouble() 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
187353d91c smbd: switch caller of fd_openat() to fd_open() 
fd_openat() was added to be used with real dirfsp, but after adding pathref fd
support we will never use this.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
4389ae9ca0 vfs_fruit: ensure the buffer passed to file_lines_parse() is 0-terminated 
Otherwise valgrind complains...

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
176290eb68 vfs_default: realign vfswrap_fgetxattr() args 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
089d8f4438 vfs: add and use vfs_fake_fd() 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
Ralph Boehme
80ac7fa7c4 build: remove smbd_conn private library 
This is not needed anymore since 6822baa2920f30374ec84363497d97e24f359fab.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
 2020-10-02 19:39:43 +00:00
David Mulder
a3cd315321 python2 reduction: Merge remaining compat code into common 
The remaining compat code (get_string, get_bytes,
cmp) are useful helper routines which we should
simply merge into common (especially since there
is some duplication here).

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

Autobuild-User(master): David Mulder <dmulder@samba.org>
Autobuild-Date(master): Fri Oct  2 14:49:36 UTC 2020 on sn-devel-184
 2020-10-02 14:49:36 +00:00
Jeremy Allison
91dc9bb659 s3: smbd: Remove the ignored last parameter 'bool *p_last_component_contains_wcard' from check_path_syntax_internal(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
 2020-10-01 21:21:38 +00:00
Jeremy Allison
a9186829eb s3: smbd: Remove unused check_path_syntax_wcard(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Sep 30 22:08:01 UTC 2020 on sn-devel-184
 2020-09-30 22:08:01 +00:00
Jeremy Allison
f9321ed7dd s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from parse_dfs_path(). 
check_path_syntax_wcard() is now unused.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
25ef25528e s3: smbd: Implement the 'allow_wcards' parameter inside parse_dfs_path(). 
Previously this didn't actually restrict wildcards here, as check_path_syntax_wcard()
returns the fact there was a wildcard in the last component, but doesn't
return an error. Just use check_path_syntax() instead and check
for wildcards separately.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
b7bb348bfe s3: smbd: Remove wrapper resolve_dfspath_wcard(). Just call dfs_redirect() directly. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
e7bb8075d2 s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from dfs_redirect() 
resolve_dfspath_wcard() is now a tranparent wrapper for dfs_redirect().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
e59c810f26 s3: smbd: Remove unused 'bool *ppath_contains_wcard' parameter from resolve_dfspath_wcard() 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
b3334eb9d8 s3: smbd: Remove the 'bool *ppath_contains_wcard' parameter from filename_convert_internal() 
It's always ignored.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
eb60ed6b5e s3: smbd: The only caller of filename_convert_with_privilege() passes in NULL for the 'bool *ppath_contains_wcard' parameter. 
Remove it.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
ff4e8b2c84 s3: smbd: All callers to filename_convert() pass in NULL for the 'bool *ppath_contains_wcard' parameter. 
Remove it.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:42 +00:00
Jeremy Allison
4d7cdefb9d s3: smbd: As srvstr_get_path_internal() ignores the wcard parameter, use check_path_syntax() instead of check_path_syntax_wcard() 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
5ea69c262d s3: smbd: Rename srvstr_get_path_wcard_internal() -> srvstr_get_path_internal(). 
It now does nothing with wildcards.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
7a1839ab73 s3: smbd: All callers to srvstr_get_path_wcard_internal() pass 'ignore' as the last parameter. 
Move it internal to srvstr_get_path_wcard_internal().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
9392b13dff s3: smbd: Remove the wrapper srvstr_get_path_req_wcard(). 
Rename srvstr_get_path_req_wcard() -> srvstr_get_path_req()
as it no longer gets ward status.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
26e8bd7e1e s3: smbd: Remove srvstr_get_path_wcard() - no longer used. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
4f0ecc7dcc s3: smbd: srvstr_get_path_wcard_posix() is no longer used. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
9c16729a7b s3: smbd: smb_file_rename_information() doesn't need to use the wildcard status of the destination. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
bf966dc2ca s3: smbd: SMB1 call_nt_transact_rename() never needs wcard bool. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
08d029c290 s3: smbd: SMB1 reply_copy(). Use srvstr_get_path_req() not srvstr_get_path_req_wcard() 
Now we check the wildcard status elsewhere. Don't pass to filename_convert() either.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
9269e9c232 s3: smbd: SMB1 reply_copy() - set the xxx_has_wild flags from the processed names. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
079aec9d09 s3: smbd: SMB1 reply_mv() no longer needs the XX_has_wcard variables. 
Use srvstr_get_path_req() not srvstr_get_path_req_wcard().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:41 +00:00
Jeremy Allison
b89c0a6d3f s3: smbd: SMB1 rename_internals() can figure out the wildcard status of the paths by itself. 
No need to pass them as parameters.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
83b17f4f3e s3: smbd: SMB1 reply_unlink() - use srvstr_get_path_req() not srvstr_get_path_req_wcard() 
Now unlink_internals() checks its own wildcard on the mask.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
0fbce94863 s3: smbd: SMB1 call_trans2findnext() doesn't need the mask_contains_wcard bool. 
dptr already knows this.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
ed0c07e298 s3: smbd: SMB1 call_trans2findfirst(). Don't need the wildcard status of the mask here. 
dptr_create() can work this out all on its own.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
96b9842e31 s3: smbd: unlink_internals() can figure out if the mask has a wildcard on its own. 
Doesn't need a parameter for that.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
49be6d3867 s3: smbd: SMB1 reply_fclose() doesn't need wcard, use srvstr_get_path_req() not srvstr_get_path_req_wcard(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
edee7198d9 s3: smbd: SMB1 reply_search(). Use srvstr_get_path_req() not srvstr_get_path_req_wcard() 
If we have a wildcard is found by other means now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
e3611cc05f s3: smbd: SMB1 reply_search(). The dptr already knows if the mask has a wildcard. 
Get the value from the dptr instead.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
97a4dfbd4a s3: smbd: SMB1 reply_search() doesn't actually care if the mask contains a wildcard or not. 
Don't pass to filename_convert().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
078f2d9456 s3: smbd: In SMB2 query directory we don't need to do full path resolution of the mask component. 
get_original_lcomp() does all the name canonicalization required for the mask.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
525ccadd64 s3: smbd: srvstr_get_path_req_wcard() is now static to reply.c 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:40 +00:00
Jeremy Allison
db20ef392e s3: smbd: SMB1 reply_ntrename() - now we set dest_has_wcard separately we don't need to pass it to filename_convert(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:39 +00:00
Jeremy Allison
f43c04164d s3: smbd: SMB1 reply_ntrename() - now we set dest_has_wcard separately we can use srvstr_get_path_req() instead of srvstr_get_path_req_wcard(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:39 +00:00
Jeremy Allison
c518111e11 s3: smbd: SMB1 reply_ntrename() - set dest_has_wcard from the parsed last component. 
We eventually want to remove the last_component_has_wcard out of the srvstr_get_pathXXX()
calls and just use srvstr_get_path_req().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:39 +00:00
Jeremy Allison
71c4c96d97 s3: smbd: SMB1 reply_ntrename() - Move the call to get_original_lcomp() to before filename_convert() for the destination name. 
Simple code re-arrangement to make the next change clear.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:39 +00:00
Jeremy Allison
b7ca811ef5 s3: smbd: SMB1 reply_ntrename() - the source cannot have a wildcard. 
Simplify the wildcard processing of the source name.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:39 +00:00
Jeremy Allison
5547cc803c s3: smbd: SMB1 comment out unused UCF_COND_ALLOW_WCARD_LCOMP flag. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2020-09-30 20:46:39 +00:00