sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

smbd: Factor out get_dirent_ea_size()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2023-01-02 16:19:12 +01:00 committed by Ralph Boehme
parent 8000c18837
commit dc98e56460
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/smbd/smb2_trans2.c
View File

@ -1137,6 +1137,15 @@ static bool smbd_dirptr_lanman2_mode_fn(TALLOC_CTX *ctx,
return true; return true;
} }
static uint32_t get_dirent_ea_size(uint32_t mode, files_struct *fsp)
{
if (!(mode & FILE_ATTRIBUTE_REPARSE_POINT)) {
unsigned ea_size = estimate_ea_size(fsp);
return ea_size;
}
return IO_REPARSE_TAG_DFS;
}
static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx, static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
connection_struct *conn, connection_struct *conn,
uint16_t flags2, uint16_t flags2,
@ -1173,6 +1182,7 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
int pad = 0; int pad = 0;
NTSTATUS status; NTSTATUS status;
struct readdir_attr_data *readdir_attr_data = NULL; struct readdir_attr_data *readdir_attr_data = NULL;
uint32_t ea_size;
if (!(mode & FILE_ATTRIBUTE_DIRECTORY)) { if (!(mode & FILE_ATTRIBUTE_DIRECTORY)) {
file_size = get_file_size_stat(&smb_fname->st); file_size = get_file_size_stat(&smb_fname->st);
@ -1299,7 +1309,7 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SIVAL(p,16,(uint32_t)allocation_size); SIVAL(p,16,(uint32_t)allocation_size);
SSVAL(p,20,mode); SSVAL(p,20,mode);
{ {
unsigned int ea_size = estimate_ea_size(smb_fname->fsp); ea_size = estimate_ea_size(smb_fname->fsp);
SIVAL(p,22,ea_size); /* Extended attributes */ SIVAL(p,22,ea_size); /* Extended attributes */
} }
p += 27; p += 27;
@ -1408,12 +1418,8 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8; SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,mode); p += 4; SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */ q = p; p += 4; /* q is placeholder for name length. */
if (mode & FILE_ATTRIBUTE_REPARSE_POINT) { ea_size = get_dirent_ea_size(mode, smb_fname->fsp);
SIVAL(p, 0, IO_REPARSE_TAG_DFS); SIVAL(p, 0, ea_size);
} else {
unsigned int ea_size = estimate_ea_size(smb_fname->fsp);
SIVAL(p,0,ea_size); /* Extended attributes */
}
p += 4; p += 4;
/* Clear the short name buffer. This is /* Clear the short name buffer. This is
* IMPORTANT as not doing so will trigger * IMPORTANT as not doing so will trigger
@ -1520,12 +1526,8 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8; SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,mode); p += 4; SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */ q = p; p += 4; /* q is placeholder for name length. */
if (mode & FILE_ATTRIBUTE_REPARSE_POINT) { ea_size = get_dirent_ea_size(mode, smb_fname->fsp);
SIVAL(p, 0, IO_REPARSE_TAG_DFS); SIVAL(p, 0, ea_size);
} else {
unsigned int ea_size = estimate_ea_size(smb_fname->fsp);
SIVAL(p,0,ea_size); /* Extended attributes */
}
p +=4; p +=4;
status = srvstr_push(base_data, flags2, p, status = srvstr_push(base_data, flags2, p,
fname, PTR_DIFF(end_data, p), fname, PTR_DIFF(end_data, p),
@ -1602,12 +1604,8 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8; SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,mode); p += 4; SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */ q = p; p += 4; /* q is placeholder for name length. */
if (mode & FILE_ATTRIBUTE_REPARSE_POINT) { ea_size = get_dirent_ea_size(mode, smb_fname->fsp);
SIVAL(p, 0, IO_REPARSE_TAG_DFS); SIVAL(p, 0, ea_size);
} else {
unsigned int ea_size = estimate_ea_size(smb_fname->fsp);
SIVAL(p,0,ea_size); /* Extended attributes */
}
p += 4; p += 4;
SIVAL(p,0,0); p += 4; /* Unknown - reserved ? */ SIVAL(p,0,0); p += 4; /* Unknown - reserved ? */
SBVAL(p,0,file_id); p += 8; SBVAL(p,0,file_id); p += 8;