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: Move SMB_QUERY_FILE_UNIX_[BASIC|INFO2] to smb1_trans2.c

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2022-12-30 16:26:38 +01:00 committed by Ralph Boehme
parent 0cfea60792
commit 01e14e0fe1
2 changed files with 101 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
source3/smbd/smb1_trans2.c
View File

@ -2097,6 +2097,52 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
max_data_bytes);
}
static NTSTATUS smb_q_unix_basic(
struct connection_struct *conn,
struct smb_request *req,
struct smb_filename *smb_fname,
struct files_struct *fsp,
char **ppdata,
int *ptotal_data)
{
const int total_data = 100;
char *pdata = NULL;
pdata = SMB_REALLOC(*ppdata, total_data);
if (pdata == NULL) {
return NT_STATUS_NO_MEMORY;
}
store_file_unix_basic(conn, pdata, fsp, &smb_fname->st);
*ppdata = pdata;
*ptotal_data = total_data;
return NT_STATUS_OK;
}
static NTSTATUS smb_q_unix_info2(
struct connection_struct *conn,
struct smb_request *req,
struct smb_filename *smb_fname,
struct files_struct *fsp,
char **ppdata,
int *ptotal_data)
{
const int total_data = 116;
char *pdata = NULL;
pdata = SMB_REALLOC(*ppdata, total_data);
if (pdata == NULL) {
return NT_STATUS_NO_MEMORY;
}
store_file_unix_basic_info2(conn, pdata, fsp, &smb_fname->st);
*ppdata = pdata;
*ptotal_data = total_data;
return NT_STATUS_OK;
}
static void call_trans2qpathinfo(
connection_struct *conn,
struct smb_request *req,
@ -2118,6 +2164,7 @@ static void call_trans2qpathinfo(
char *fname = NULL;
uint32_t ucf_flags = ucf_flags_from_smb_request(req);
NTTIME twrp = 0;
bool info_level_handled;
NTSTATUS status = NT_STATUS_OK;
int ret;
@ -2279,6 +2326,48 @@ static void call_trans2qpathinfo(
return;
}
info_level_handled = true; /* Untouched in switch cases below */
switch (info_level) {
default:
info_level_handled = false;
break;
case SMB_QUERY_FILE_UNIX_BASIC:
status = smb_q_unix_basic(
conn,
req,
smb_fname,
smb_fname->fsp,
ppdata,
&total_data);
break;
case SMB_QUERY_FILE_UNIX_INFO2:
status = smb_q_unix_info2(
conn,
req,
smb_fname,
smb_fname->fsp,
ppdata,
&total_data);
break;
}
if (info_level_handled) {
handle_trans2qfilepathinfo_result(
conn,
req,
info_level,
status,
*ppdata,
total_data,
total_data,
max_data_bytes);
return;
}
call_trans2qfilepathinfo(
conn,
req,
@ -2300,8 +2389,7 @@ static NTSTATUS smb_q_posix_lock(
struct smb_request *req,
struct files_struct *fsp,
char **ppdata,
int *ptotal_data,
unsigned int max_data_bytes)
int *ptotal_data)
{
char *pdata = *ppdata;
int total_data = *ptotal_data;
@ -2498,8 +2586,17 @@ static void call_trans2qfileinfo(
break;
case SMB_QUERY_POSIX_LOCK:
status = smb_q_posix_lock(
conn, req, fsp, ppdata, &total_data, max_data_bytes);
status = smb_q_posix_lock(conn, req, fsp, ppdata, &total_data);
break;
case SMB_QUERY_FILE_UNIX_BASIC:
status = smb_q_unix_basic(
conn, req, fsp->fsp_name, fsp, ppdata, &total_data);
break;
case SMB_QUERY_FILE_UNIX_INFO2:
status = smb_q_unix_info2(
conn, req, fsp->fsp_name, fsp, ppdata, &total_data);
break;
}

27
source3/smbd/smb2_trans2.c
View File

@ -4196,33 +4196,6 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
* CIFS UNIX Extensions.
*/
case SMB_QUERY_FILE_UNIX_BASIC:
pdata = store_file_unix_basic(conn, pdata, fsp, psbuf);
data_size = PTR_DIFF(pdata,(*ppdata));
DEBUG(4,("smbd_do_qfilepathinfo: "
"SMB_QUERY_FILE_UNIX_BASIC\n"));
dump_data(4, (uint8_t *)(*ppdata), data_size);
break;
case SMB_QUERY_FILE_UNIX_INFO2:
pdata = store_file_unix_basic_info2(conn, pdata, fsp, psbuf);
data_size = PTR_DIFF(pdata,(*ppdata));
{
int i;
DEBUG(4,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_INFO2 "));
for (i=0; i<100; i++)
DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
DEBUG(4,("\n"));
}
break;
case SMB_QUERY_FILE_UNIX_LINK:
{
status = smb_unix_read_symlink(conn,