From: Volker Lendecke Date: Fri, 17 May 2024 10:23:19 +0000 (+0200) Subject: libsmb: Use the direct FSCC_ infolevels X-Git-Tag: tdb-1.4.11~618 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06a322a17f8c170caf3e778125bcf66325eb58f4;p=thirdparty%2Fsamba.git libsmb: Use the direct FSCC_ infolevels Could have done this as part of 1776918c5bf already. Signed-off-by: Volker Lendecke Reviewed-by: Andrew Bartlett --- diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c index cea27444b97..ea50fd978d9 100644 --- a/source3/libsmb/cli_smb2_fnum.c +++ b/source3/libsmb/cli_smb2_fnum.c @@ -725,7 +725,7 @@ struct tevent_req *cli_smb2_delete_on_close_send(TALLOC_CTX *mem_ctx, * level 13 (SMB_FILE_DISPOSITION_INFORMATION - 1000). */ in_info_type = 1; - in_file_info_class = SMB_FILE_DISPOSITION_INFORMATION - 1000; + in_file_info_class = FSCC_FILE_DISPOSITION_INFORMATION; /* Setup data array. */ SCVAL(&state->data[0], 0, flag ? 1 : 0); state->inbuf.data = &state->data[0]; @@ -2437,12 +2437,12 @@ NTSTATUS cli_smb2_setatr(struct cli_state *cli, SBVAL(inbuf.data, 8, 0xFFFFFFFFFFFFFFFFLL); SBVAL(inbuf.data, 24, 0xFFFFFFFFFFFFFFFFLL); - return cli_smb2_setpathinfo(cli, - name, - 1, /* in_info_type */ - /* in_file_info_class */ - SMB_FILE_BASIC_INFORMATION - 1000, - &inbuf); + return cli_smb2_setpathinfo( + cli, + name, + 1, /* in_info_type */ + FSCC_FILE_BASIC_INFORMATION, /* in_file_info_class */ + &inbuf); } @@ -2486,13 +2486,13 @@ NTSTATUS cli_smb2_setattrE(struct cli_state *cli, put_long_date((char *)inbuf.data + 16, write_time); } - status = cli_smb2_set_info_fnum(cli, - fnum, - 1, /* in_info_type */ - SMB_FILE_BASIC_INFORMATION - - 1000, /* in_file_info_class */ - &inbuf, /* in_input_buffer */ - 0); /* in_additional_info */ + status = cli_smb2_set_info_fnum( + cli, + fnum, + 1, /* in_info_type */ + FSCC_FILE_BASIC_INFORMATION, /* in_file_info_class */ + &inbuf, /* in_input_buffer */ + 0); /* in_additional_info */ cli->raw_status = status; return status; } @@ -2647,12 +2647,12 @@ NTSTATUS cli_smb2_get_fs_full_size_info(struct cli_state *cli, status = cli_smb2_query_info_fnum( cli, fnum, - SMB2_0_INFO_FILESYSTEM, /* in_info_type */ - SMB_FS_FULL_SIZE_INFORMATION - 1000, /* in_file_info_class */ - 0xFFFF, /* in_max_output_length */ - NULL, /* in_input_buffer */ - 0, /* in_additional_info */ - 0, /* in_flags */ + SMB2_0_INFO_FILESYSTEM, /* in_info_type */ + FSCC_FS_FULL_SIZE_INFORMATION, /* in_file_info_class */ + 0xFFFF, /* in_max_output_length */ + NULL, /* in_input_buffer */ + 0, /* in_additional_info */ + 0, /* in_flags */ frame, &outbuf); if (!NT_STATUS_IS_OK(status)) { @@ -2812,11 +2812,11 @@ NTSTATUS cli_smb2_get_fs_volume_info(struct cli_state *cli, fnum, SMB2_0_INFO_FILESYSTEM, /* in_info_type */ /* in_file_info_class */ - SMB_FS_VOLUME_INFORMATION - 1000, + FSCC_FS_VOLUME_INFORMATION, 0xFFFF, /* in_max_output_length */ - NULL, /* in_input_buffer */ - 0, /* in_additional_info */ - 0, /* in_flags */ + NULL, /* in_input_buffer */ + 0, /* in_additional_info */ + 0, /* in_flags */ frame, &outbuf); if (!NT_STATUS_IS_OK(status)) { @@ -3154,14 +3154,14 @@ static struct tevent_req *cli_smb2_rename_fnum_send( level SMB2_FILE_RENAME_INFORMATION (SMB_FILE_RENAME_INFORMATION - 1000) */ subreq = cli_smb2_set_info_fnum_send( - state, /* mem_ctx */ - ev, /* ev */ - cli, /* cli */ - fnum, /* fnum */ - 1, /* in_info_type */ - SMB_FILE_RENAME_INFORMATION - 1000, /* in_file_info_class */ - &state->inbuf, /* in_input_buffer */ - 0); /* in_additional_info */ + state, /* mem_ctx */ + ev, /* ev */ + cli, /* cli */ + fnum, /* fnum */ + 1, /* in_info_type */ + FSCC_FILE_RENAME_INFORMATION, /* in_file_info_class */ + &state->inbuf, /* in_input_buffer */ + 0); /* in_additional_info */ if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); } @@ -3374,10 +3374,10 @@ NTSTATUS cli_smb2_set_ea_fnum(struct cli_state *cli, status = cli_smb2_set_info_fnum( cli, fnum, - 1, /* in_info_type */ - SMB_FILE_FULL_EA_INFORMATION - 1000, /* in_file_info_class */ - &inbuf, /* in_input_buffer */ - 0); /* in_additional_info */ + 1, /* in_info_type */ + FSCC_FILE_FULL_EA_INFORMATION, /* in_file_info_class */ + &inbuf, /* in_input_buffer */ + 0); /* in_additional_info */ fail: @@ -3483,12 +3483,12 @@ NTSTATUS cli_smb2_get_ea_list_path(struct cli_state *cli, status = cli_smb2_query_info_fnum( cli, fnum, - 1, /* in_info_type */ - SMB_FILE_FULL_EA_INFORMATION - 1000, /* in_file_info_class */ - 0xFFFF, /* in_max_output_length */ - NULL, /* in_input_buffer */ - 0, /* in_additional_info */ - 0, /* in_flags */ + 1, /* in_info_type */ + FSCC_FILE_FULL_EA_INFORMATION, /* in_file_info_class */ + 0xFFFF, /* in_max_output_length */ + NULL, /* in_input_buffer */ + 0, /* in_additional_info */ + 0, /* in_flags */ frame, &outbuf); @@ -3735,12 +3735,12 @@ NTSTATUS cli_smb2_get_fs_quota_info(struct cli_state *cli, status = cli_smb2_query_info_fnum( cli, quota_fnum, - 2, /* in_info_type */ - SMB_FS_QUOTA_INFORMATION - 1000, /* in_file_info_class */ - 0xFFFF, /* in_max_output_length */ - NULL, /* in_input_buffer */ - 0, /* in_additional_info */ - 0, /* in_flags */ + 2, /* in_info_type */ + FSCC_FS_QUOTA_INFORMATION, /* in_file_info_class */ + 0xFFFF, /* in_max_output_length */ + NULL, /* in_input_buffer */ + 0, /* in_additional_info */ + 0, /* in_flags */ frame, &outbuf); @@ -3823,10 +3823,10 @@ NTSTATUS cli_smb2_set_fs_quota_info(struct cli_state *cli, status = cli_smb2_set_info_fnum( cli, quota_fnum, - 2, /* in_info_type */ - SMB_FS_QUOTA_INFORMATION - 1000, /* in_file_info_class */ - &inbuf, /* in_input_buffer */ - 0); /* in_additional_info */ + 2, /* in_info_type */ + FSCC_FS_QUOTA_INFORMATION, /* in_file_info_class */ + &inbuf, /* in_input_buffer */ + 0); /* in_additional_info */ cleanup: cli->raw_status = status; @@ -4731,9 +4731,9 @@ NTSTATUS cli_smb2_ftruncate(struct cli_state *cli, status = cli_smb2_set_info_fnum( cli, fnum, - 1, /* in_info_type */ - SMB_FILE_END_OF_FILE_INFORMATION-1000, /* in_file_info_class */ - &inbuf, /* in_input_buffer */ + 1, /* in_info_type */ + FSCC_FILE_END_OF_FILE_INFORMATION, /* in_file_info_class */ + &inbuf, /* in_input_buffer */ 0); fail: diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 354d8960dd8..2c331b8167d 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -2026,10 +2026,10 @@ static void cli_smb2_hardlink_opened(struct tevent_req *subreq) state->ev, state->cli, state->fnum_src, - 1, /* in_info_type */ - SMB_FILE_LINK_INFORMATION - 1000, /* in_file_info_class */ + 1, /* in_info_type */ + FSCC_FILE_LINK_INFORMATION, /* in_file_info_class */ &inbuf, - 0); /* in_additional_info */ + 0); /* in_additional_info */ if (tevent_req_nomem(subreq, req)) { return; } diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 9897b5a3072..b25f6832273 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -625,10 +625,10 @@ NTSTATUS cli_setpathinfo_ext(struct cli_state *cli, const char *fname, * the correct info type and level. */ return cli_smb2_setpathinfo(cli, - fname, - 1, /* SMB2_SETINFO_FILE */ - SMB_FILE_BASIC_INFORMATION - 1000, - &in_data); + fname, + 1, /* SMB2_SETINFO_FILE */ + FSCC_FILE_BASIC_INFORMATION, + &in_data); } return cli_setpathinfo( @@ -681,9 +681,9 @@ struct tevent_req *cli_setfileinfo_ext_send( cli, fnum, SMB2_0_INFO_FILE, - SMB_FILE_BASIC_INFORMATION - 1000, + FSCC_FILE_BASIC_INFORMATION, &state->in_data, - 0); /* in_additional_info */ + 0); /* in_additional_info */ if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); }