From 451b11251f7f3a517f94c5d57dab327a30bab52f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 27 Sep 2013 05:34:12 +0200 Subject: [PATCH] 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 Reviewed-by: Michael Adam --- source3/libsmb/async_smb.c | 22 ---------------------- source3/libsmb/clitrans.c | 21 --------------------- 2 files changed, 43 deletions(-) diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index ed68a5d927..8d5c3d4b26 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -76,17 +76,6 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx, } *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, additional_flags, clear_flags, additional_flags2, clear_flags2, @@ -134,17 +123,6 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx, } *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, additional_flags, clear_flags, additional_flags2, clear_flags2, diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index 08fda5fdb5..54621348f3 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -73,16 +73,6 @@ struct tevent_req *cli_trans_send( return NULL; } *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, 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 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, cli->conn, trans_cmd, additional_flags, clear_flags, -- 2.34.1