mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
s3:libsmb: don't pass down FLAG_CASELESS_PATHNAMES and FLAGS2_DFS_PATHNAMES anymore
They're now handled at the smbXcli_conn and smbXcli_tcon layer. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10200 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
parent
226dde2879
commit
451b11251f
@ -76,17 +76,6 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
|
|||||||
}
|
}
|
||||||
*state->ptr = state;
|
*state->ptr = state;
|
||||||
|
|
||||||
if (cli->case_sensitive) {
|
|
||||||
clear_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
} else {
|
|
||||||
/* Default setting, case insensitive. */
|
|
||||||
additional_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
|
|
||||||
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
state->req = smb1cli_req_create(state, ev, cli->conn, smb_command,
|
state->req = smb1cli_req_create(state, ev, cli->conn, smb_command,
|
||||||
additional_flags, clear_flags,
|
additional_flags, clear_flags,
|
||||||
additional_flags2, clear_flags2,
|
additional_flags2, clear_flags2,
|
||||||
@ -134,17 +123,6 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
|
|||||||
}
|
}
|
||||||
*state->ptr = state;
|
*state->ptr = state;
|
||||||
|
|
||||||
if (cli->case_sensitive) {
|
|
||||||
clear_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
} else {
|
|
||||||
/* Default setting, case insensitive. */
|
|
||||||
additional_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
|
|
||||||
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
state->req = smb1cli_req_send(state, ev, cli->conn, smb_command,
|
state->req = smb1cli_req_send(state, ev, cli->conn, smb_command,
|
||||||
additional_flags, clear_flags,
|
additional_flags, clear_flags,
|
||||||
additional_flags2, clear_flags2,
|
additional_flags2, clear_flags2,
|
||||||
|
@ -73,16 +73,6 @@ struct tevent_req *cli_trans_send(
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
*state->ptr = state;
|
*state->ptr = state;
|
||||||
if (cli->case_sensitive) {
|
|
||||||
clear_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
} else {
|
|
||||||
/* Default setting, case insensitive. */
|
|
||||||
additional_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
|
|
||||||
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
state->req = smb1cli_trans_send(state, ev,
|
state->req = smb1cli_trans_send(state, ev,
|
||||||
cli->conn, cmd,
|
cli->conn, cmd,
|
||||||
@ -169,17 +159,6 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
|
|||||||
uint16_t additional_flags2 = 0;
|
uint16_t additional_flags2 = 0;
|
||||||
uint16_t clear_flags2 = 0;
|
uint16_t clear_flags2 = 0;
|
||||||
|
|
||||||
if (cli->case_sensitive) {
|
|
||||||
clear_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
} else {
|
|
||||||
/* Default setting, case insensitive. */
|
|
||||||
additional_flags |= FLAG_CASELESS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
|
|
||||||
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
|
|
||||||
}
|
|
||||||
|
|
||||||
status = smb1cli_trans(mem_ctx,
|
status = smb1cli_trans(mem_ctx,
|
||||||
cli->conn, trans_cmd,
|
cli->conn, trans_cmd,
|
||||||
additional_flags, clear_flags,
|
additional_flags, clear_flags,
|
||||||
|
Loading…
Reference in New Issue
Block a user