sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3: smbd: Convert all but one use of lp_posix_pathnames() into req->posix_pathnames in trans2.c

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
This commit is contained in:
Jeremy Allison 2015-12-22 13:49:55 -08:00
parent 3cd1b185bd
commit a2f025e26b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/smbd/trans2.c
View File

@ -1097,7 +1097,7 @@ static void call_trans2open(connection_struct *conn,
uint32_t create_disposition;
uint32_t create_options = 0;
uint32_t private_flags = 0;
uint32_t ucf_flags = (lp_posix_pathnames() ? UCF_POSIX_PATHNAMES : 0);
uint32_t ucf_flags = (req->posix_pathnames ? UCF_POSIX_PATHNAMES : 0);
TALLOC_CTX *ctx = talloc_tos();
/*
@ -1131,7 +1131,7 @@ static void call_trans2open(connection_struct *conn,
goto out;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(ctx,
params,
req->flags2,
@ -2495,7 +2495,7 @@ static void call_trans2findfirst(connection_struct *conn,
struct dptr_struct *dirptr = NULL;
struct smbd_server_connection *sconn = req->sconn;
uint32_t ucf_flags = UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP |
(lp_posix_pathnames() ? UCF_POSIX_PATHNAMES : 0);
(req->posix_pathnames ? UCF_POSIX_PATHNAMES : 0);
bool backup_priv = false;
bool as_root = false;
@ -2553,7 +2553,7 @@ close_if_end = %d requires_resume_key = %d backup_priv = %d level = 0x%x, max_da
goto out;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_wcard_posix(ctx,
params,
req->flags2,
@ -2929,7 +2929,7 @@ static void call_trans2findnext(connection_struct *conn,
if (!continue_bit) {
/* We only need resume_name if continue_bit is zero. */
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_wcard_posix(ctx,
params,
req->flags2,
@ -5595,7 +5595,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
} else {
uint32_t name_hash;
char *fname = NULL;
uint32_t ucf_flags = (lp_posix_pathnames() ?
uint32_t ucf_flags = (req->posix_pathnames ?
UCF_POSIX_PATHNAMES : 0);
/* qpathinfo */
@ -5620,7 +5620,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
}
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(req,
params,
req->flags2,
@ -6442,7 +6442,7 @@ static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
{
char *oldname = NULL;
struct smb_filename *smb_fname_old = NULL;
uint32_t ucf_flags = (lp_posix_pathnames() ? UCF_POSIX_PATHNAMES : 0);
uint32_t ucf_flags = (req->posix_pathnames ? UCF_POSIX_PATHNAMES : 0);
TALLOC_CTX *ctx = talloc_tos();
NTSTATUS status = NT_STATUS_OK;
@ -6451,7 +6451,7 @@ static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(ctx,
pdata,
req->flags2,
@ -6508,7 +6508,7 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
char *newname = NULL;
struct smb_filename *smb_fname_dst = NULL;
uint32_t ucf_flags = UCF_SAVE_LCOMP |
(lp_posix_pathnames() ? UCF_POSIX_PATHNAMES : 0);
(req->posix_pathnames ? UCF_POSIX_PATHNAMES : 0);
NTSTATUS status = NT_STATUS_OK;
TALLOC_CTX *ctx = talloc_tos();
@ -6527,7 +6527,7 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(ctx,
pdata,
req->flags2,
@ -6618,7 +6618,7 @@ static NTSTATUS smb_file_link_information(connection_struct *conn,
struct smb_filename *smb_fname_dst = NULL;
NTSTATUS status = NT_STATUS_OK;
uint32_t ucf_flags = UCF_SAVE_LCOMP |
(lp_posix_pathnames() ? UCF_POSIX_PATHNAMES : 0);
(req->posix_pathnames ? UCF_POSIX_PATHNAMES : 0);
TALLOC_CTX *ctx = talloc_tos();
if (!fsp) {
@ -6636,7 +6636,7 @@ static NTSTATUS smb_file_link_information(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(ctx,
pdata,
req->flags2,
@ -6726,7 +6726,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_wcard_posix(ctx,
pdata,
req->flags2,
@ -8564,7 +8564,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
}
} else {
char *fname = NULL;
uint32_t ucf_flags = (lp_posix_pathnames() ?
uint32_t ucf_flags = (req->posix_pathnames ?
UCF_POSIX_PATHNAMES : 0);
/* set path info */
@ -8574,7 +8574,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
}
info_level = SVAL(params,0);
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(req,
params,
req->flags2,
@ -8715,7 +8715,7 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
char *directory = NULL;
NTSTATUS status = NT_STATUS_OK;
struct ea_list *ea_list = NULL;
uint32_t ucf_flags = (lp_posix_pathnames() ? UCF_POSIX_PATHNAMES : 0);
uint32_t ucf_flags = (req->posix_pathnames ? UCF_POSIX_PATHNAMES : 0);
TALLOC_CTX *ctx = talloc_tos();
if (!CAN_WRITE(conn)) {
@ -8728,7 +8728,7 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
return;
}
if (lp_posix_pathnames()) {
if (req->posix_pathnames) {
srvstr_get_path_posix(ctx,
params,
req->flags2,