summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-07-29 16:12:16 +0200
committerVolker Lendecke <vl@samba.org>2011-07-29 16:43:17 +0200
commit6d67d41444aef527215d985bdcdb0f214de875f9 (patch)
tree220b0814a6a5ac414c8c49a8cd638d709746f1e7
parent0b5c4a601a983aab06e4aba158cd9359babd1e71 (diff)
downloadsamba-6d67d41444aef527215d985bdcdb0f214de875f9.tar.gz
samba-6d67d41444aef527215d985bdcdb0f214de875f9.tar.bz2
samba-6d67d41444aef527215d985bdcdb0f214de875f9.zip
s3: We only need base_name in map_open_params_to_ntcreate
-rw-r--r--source3/smbd/open.c8
-rw-r--r--source3/smbd/proto.h2
-rw-r--r--source3/smbd/reply.c8
-rw-r--r--source3/smbd/trans2.c3
4 files changed, 12 insertions, 9 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d81c278110..82125832cb 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1339,7 +1339,7 @@ NTSTATUS fcb_or_dos_open(struct smb_request *req,
Open a file with a share mode - old openX method - map into NTCreate.
****************************************************************************/
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
int deny_mode, int open_func,
uint32 *paccess_mask,
uint32 *pshare_mode,
@@ -1355,7 +1355,7 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
"open_func = 0x%x\n",
- smb_fname_str_dbg(smb_fname), (unsigned int)deny_mode,
+ smb_base_fname, (unsigned int)deny_mode,
(unsigned int)open_func ));
/* Create the NT compatible access_mask. */
@@ -1430,7 +1430,7 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
case DENY_DOS:
private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
- if (is_executable(smb_fname->base_name)) {
+ if (is_executable(smb_base_fname)) {
share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
} else {
if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_RDONLY) {
@@ -1455,7 +1455,7 @@ bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, "
"share_mode = 0x%x, create_disposition = 0x%x, "
"create_options = 0x%x private_flags = 0x%x\n",
- smb_fname_str_dbg(smb_fname),
+ smb_base_fname,
(unsigned int)access_mask,
(unsigned int)share_mode,
(unsigned int)create_disposition,
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 1f414db59f..763a946a16 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -609,7 +609,7 @@ NTSTATUS fcb_or_dos_open(struct smb_request *req,
uint32 access_mask,
uint32 share_access,
uint32 create_options);
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
int deny_mode, int open_func,
uint32 *paccess_mask,
uint32 *pshare_mode,
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index e740fb4c57..59ec8f212e 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1789,7 +1789,7 @@ void reply_open(struct smb_request *req)
goto out;
}
- if (!map_open_params_to_ntcreate(smb_fname, deny_mode,
+ if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
OPENX_FILE_EXISTS_OPEN, &access_mask,
&share_mode, &create_disposition,
&create_options, &private_flags)) {
@@ -1964,7 +1964,8 @@ void reply_open_and_X(struct smb_request *req)
goto out;
}
- if (!map_open_params_to_ntcreate(smb_fname, deny_mode, smb_ofun,
+ if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+ smb_ofun,
&access_mask, &share_mode,
&create_disposition,
&create_options,
@@ -6755,7 +6756,8 @@ NTSTATUS copy_file(TALLOC_CTX *ctx,
if (!target_is_directory && count) {
new_create_disposition = FILE_OPEN;
} else {
- if (!map_open_params_to_ntcreate(smb_fname_dst_tmp, 0, ofun,
+ if (!map_open_params_to_ntcreate(smb_fname_dst_tmp->base_name,
+ 0, ofun,
NULL, NULL,
&new_create_disposition,
NULL,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 90eb40a62f..859d2adef4 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1082,7 +1082,8 @@ static void call_trans2open(connection_struct *conn,
goto out;
}
- if (!map_open_params_to_ntcreate(smb_fname, deny_mode, open_ofun,
+ if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+ open_ofun,
&access_mask, &share_mode,
&create_disposition,
&create_options,