sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

smbd: Use full_path_tos() where appropriate

Browse Source 
Recently I've got reports that SMB2_FIND is slower than trans2 findfirst,
so this tries to use recent performance-sensitive APIs right from the
start :-)

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-06-11 09:32:56 +00:00 committed by Jeremy Allison
parent 62403c4992
commit 25c14ef092
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/smbd/smb2_find.c
View File

@ -330,17 +330,23 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
if (!wcard_has_wild) {
struct smb_filename *smb_fname = NULL;
const char *fullpath;
char tmpbuf[PATH_MAX];
char *to_free = NULL;
if (ISDOT(fsp->fsp_name->base_name)) {
fullpath = in_file_name;
} else {
fullpath = talloc_asprintf(state,
"%s/%s",
fsp->fsp_name->base_name,
in_file_name);
}
if (tevent_req_nomem(fullpath, req)) {
return tevent_req_post(req, ev);
size_t len;
char *tmp;
len = full_path_tos(
fsp->fsp_name->base_name, in_file_name,
tmpbuf, sizeof(tmpbuf), &tmp, &to_free);
if (len == -1) {
tevent_req_oom(req);
return tevent_req_post(req, ev);
}
fullpath = tmp;
}
status = filename_convert(state,
conn,
@ -350,6 +356,8 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
&wcard_has_wild,
&smb_fname);
TALLOC_FREE(to_free);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);
return tevent_req_post(req, ev);