The branch, master has been updated
via 8e870dd vfs: remove an outdate comment from the files_struct
definition
via 8e88b97 VFS: Modify chmod_acl to take a const struct smb_filename *
instead of const char *
via ac8fba6 VFS: Modify chmod to take a const struct smb_filename *
instead of const char *
from d7ca174 s3:smbd: add negprot remote arch detection for OSX
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8e870dd121f82f359abfdc456c015b096094a1fb
Author: Michael Adam <[email protected]>
Date: Wed Mar 2 21:54:58 2016 +0100
vfs: remove an outdate comment from the files_struct definition
Leases are implemented since a while...
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Ralph Böhme <[email protected]>
Autobuild-Date(master): Thu Mar 3 12:16:47 CET 2016 on sn-devel-144
commit 8e88b9783dec751fe5bd4750923b62b978080885
Author: Jeremy Allison <[email protected]>
Date: Tue Mar 1 17:25:25 2016 -0800
VFS: Modify chmod_acl to take a const struct smb_filename * instead of
const char *
Preparing to reduce use of lp_posix_pathnames().
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
commit ac8fba6ef7093836eb6988e749325b69e7a7fde1
Author: Jeremy Allison <[email protected]>
Date: Tue Mar 1 16:20:25 2016 -0800
VFS: Modify chmod to take a const struct smb_filename * instead of const
char *
Preparing to reduce use of lp_posix_pathnames().
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/skel_opaque.c | 9 ++++--
examples/VFS/skel_transparent.c | 13 +++++---
source3/include/vfs.h | 24 ++++++++++-----
source3/include/vfs_macros.h | 16 +++++-----
source3/modules/vfs_acl_common.c | 10 +++---
source3/modules/vfs_audit.c | 16 ++++++----
source3/modules/vfs_cap.c | 53 +++++++++++++++++++++++++++----
source3/modules/vfs_catia.c | 49 ++++++++++++++++++++++++-----
source3/modules/vfs_ceph.c | 20 +++++++++---
source3/modules/vfs_default.c | 21 +++++++++----
source3/modules/vfs_extd_audit.c | 20 +++++++-----
source3/modules/vfs_fruit.c | 21 ++++++++++---
source3/modules/vfs_full_audit.c | 16 ++++++----
source3/modules/vfs_glusterfs.c | 5 +--
source3/modules/vfs_gpfs.c | 14 ++++++---
source3/modules/vfs_linux_xfs_sgid.c | 5 +--
source3/modules/vfs_media_harmony.c | 50 +++++++++++++-----------------
source3/modules/vfs_netatalk.c | 20 ++++++++----
source3/modules/vfs_shadow_copy2.c | 60 +++++++++++++++++++++++++++---------
source3/modules/vfs_snapper.c | 58 ++++++++++++++++++++++++++--------
source3/modules/vfs_time_audit.c | 18 +++++++----
source3/modules/vfs_unityed_media.c | 42 ++++++++++++++-----------
source3/smbd/dosmode.c | 2 +-
source3/smbd/open.c | 2 +-
source3/smbd/posix_acls.c | 4 +--
source3/smbd/trans2.c | 2 +-
source3/smbd/vfs.c | 14 +++++----
source3/torture/cmd_vfs.c | 24 +++++++++++++--
28 files changed, 426 insertions(+), 182 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 4ffdacc..e7bb645 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -367,7 +367,9 @@ static int skel_unlink(vfs_handle_struct *handle,
return -1;
}
-static int skel_chmod(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int skel_chmod(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
errno = ENOSYS;
return -1;
@@ -690,8 +692,9 @@ static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
return NT_STATUS_NOT_IMPLEMENTED;
}
-static int skel_chmod_acl(vfs_handle_struct *handle, const char *name,
- mode_t mode)
+static int skel_chmod_acl(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
errno = ENOSYS;
return -1;
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 5d3ffb7..fe2356a 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -475,9 +475,11 @@ static int skel_unlink(vfs_handle_struct *handle,
return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
}
-static int skel_chmod(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int skel_chmod(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- return SMB_VFS_NEXT_CHMOD(handle, path, mode);
+ return SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
}
static int skel_fchmod(vfs_handle_struct *handle, files_struct *fsp,
@@ -821,10 +823,11 @@ static NTSTATUS skel_fset_nt_acl(vfs_handle_struct
*handle, files_struct *fsp,
return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
}
-static int skel_chmod_acl(vfs_handle_struct *handle, const char *name,
- mode_t mode)
+static int skel_chmod_acl(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- return SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode);
+ return SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
}
static int skel_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp,
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 9ea4e75..c8e0494 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -180,6 +180,10 @@
/* Version 35 - Change opendir from const char *, to
const struct smb_filename * */
/* Version 35 - Wrap aio async funtions args in a struct vfs_aio_state */
+/* Version 35 - Change chmod from const char *, to
+ const struct smb_filename * */
+/* Version 35 - Change chmod_acl from const char *, to
+ const struct smb_filename * */
#define SMB_VFS_INTERFACE_VERSION 35
@@ -254,7 +258,7 @@ typedef struct files_struct {
bool write_time_forced;
int oplock_type;
- struct fsp_lease *lease; /* Not yet used. Placeholder for leases. */
+ struct fsp_lease *lease;
int sent_oplock_break;
struct tevent_timer *oplock_timeout;
struct lock_struct last_lock_failure;
@@ -638,7 +642,9 @@ struct vfs_fn_pointers {
uint64_t (*get_alloc_size_fn)(struct vfs_handle_struct *handle, struct
files_struct *fsp, const SMB_STRUCT_STAT *sbuf);
int (*unlink_fn)(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname);
- int (*chmod_fn)(struct vfs_handle_struct *handle, const char *path,
mode_t mode);
+ int (*chmod_fn)(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode);
int (*fchmod_fn)(struct vfs_handle_struct *handle, struct files_struct
*fsp, mode_t mode);
int (*chown_fn)(struct vfs_handle_struct *handle, const char *path,
uid_t uid, gid_t gid);
int (*fchown_fn)(struct vfs_handle_struct *handle, struct files_struct
*fsp, uid_t uid, gid_t gid);
@@ -783,7 +789,9 @@ struct vfs_fn_pointers {
/* POSIX ACL operations. */
- int (*chmod_acl_fn)(struct vfs_handle_struct *handle, const char *name,
mode_t mode);
+ int (*chmod_acl_fn)(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode);
int (*fchmod_acl_fn)(struct vfs_handle_struct *handle, struct
files_struct *fsp, mode_t mode);
SMB_ACL_T (*sys_acl_get_file_fn)(struct vfs_handle_struct *handle,
@@ -1082,8 +1090,9 @@ uint64_t smb_vfs_call_get_alloc_size(struct
vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf);
int smb_vfs_call_unlink(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname);
-int smb_vfs_call_chmod(struct vfs_handle_struct *handle, const char *path,
- mode_t mode);
+int smb_vfs_call_chmod(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode);
int smb_vfs_call_fchmod(struct vfs_handle_struct *handle,
struct files_struct *fsp, mode_t mode);
int smb_vfs_call_chown(struct vfs_handle_struct *handle, const char *path,
@@ -1225,8 +1234,9 @@ NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct
*handle,
struct security_acl *sacl,
uint32_t access_requested,
uint32_t access_denied);
-int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle, const char *name,
- mode_t mode);
+int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle,
+ const struct smb_filename *file,
+ mode_t mode);
int smb_vfs_call_fchmod_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp, mode_t mode);
SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle,
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 2e8ca18..e5e3c99 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -241,10 +241,10 @@
#define SMB_VFS_NEXT_UNLINK(handle, path) \
smb_vfs_call_unlink((handle)->next, (path))
-#define SMB_VFS_CHMOD(conn, path, mode) \
- smb_vfs_call_chmod((conn)->vfs_handles, (path), (mode))
-#define SMB_VFS_NEXT_CHMOD(handle, path, mode) \
- smb_vfs_call_chmod((handle)->next, (path), (mode))
+#define SMB_VFS_CHMOD(conn, smb_fname, mode) \
+ smb_vfs_call_chmod((conn)->vfs_handles, (smb_fname), (mode))
+#define SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode) \
+ smb_vfs_call_chmod((handle)->next, (smb_fname), (mode))
#define SMB_VFS_FCHMOD(fsp, mode) \
smb_vfs_call_fchmod((fsp)->conn->vfs_handles, (fsp), (mode))
@@ -452,10 +452,10 @@
#define SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd) \
smb_vfs_call_fset_nt_acl((handle)->next, (fsp), (security_info_sent),
(psd))
-#define SMB_VFS_CHMOD_ACL(conn, name, mode) \
- smb_vfs_call_chmod_acl((conn)->vfs_handles, (name), (mode))
-#define SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode) \
- smb_vfs_call_chmod_acl((handle)->next, (name), (mode))
+#define SMB_VFS_CHMOD_ACL(conn, smb_fname, mode) \
+ smb_vfs_call_chmod_acl((conn)->vfs_handles, (smb_fname), (mode))
+#define SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode) \
+ smb_vfs_call_chmod_acl((handle)->next, (smb_fname), (mode))
#define SMB_VFS_FCHMOD_ACL(fsp, mode) \
smb_vfs_call_fchmod_acl((fsp)->conn->vfs_handles, (fsp), (mode))
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0c0cf83..ba93e7b 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -1084,11 +1084,12 @@ static int unlink_acl_common(struct vfs_handle_struct
*handle,
}
static int chmod_acl_module_common(struct vfs_handle_struct *handle,
- const char *path, mode_t mode)
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
if (lp_posix_pathnames()) {
/* Only allow this on POSIX pathnames. */
- return SMB_VFS_NEXT_CHMOD(handle, path, mode);
+ return SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
}
return 0;
}
@@ -1104,11 +1105,12 @@ static int fchmod_acl_module_common(struct
vfs_handle_struct *handle,
}
static int chmod_acl_acl_module_common(struct vfs_handle_struct *handle,
- const char *name, mode_t mode)
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
if (lp_posix_pathnames()) {
/* Only allow this on POSIX pathnames. */
- return SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode);
+ return SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
}
return 0;
}
diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index fa47b3c..cef3bb5 100644
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -217,28 +217,32 @@ static int audit_unlink(vfs_handle_struct *handle,
return result;
}
-static int audit_chmod(vfs_handle_struct *handle, const char *path, mode_t
mode)
+static int audit_chmod(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
- result = SMB_VFS_NEXT_CHMOD(handle, path, mode);
+ result = SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
syslog(audit_syslog_priority(handle), "chmod %s mode 0x%x %s%s\n",
- path, mode,
+ smb_fname->base_name, mode,
(result < 0) ? "failed: " : "",
(result < 0) ? strerror(errno) : "");
return result;
}
-static int audit_chmod_acl(vfs_handle_struct *handle, const char *path, mode_t
mode)
+static int audit_chmod_acl(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
- result = SMB_VFS_NEXT_CHMOD_ACL(handle, path, mode);
+ result = SMB_VFS_NEXT_CHMOD_ACL(handle, smb_fname, mode);
syslog(audit_syslog_priority(handle), "chmod_acl %s mode 0x%x %s%s\n",
- path, mode,
+ smb_fname->base_name, mode,
(result < 0) ? "failed: " : "",
(result < 0) ? strerror(errno) : "");
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index f96455c..0bb943d 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -304,15 +304,36 @@ static int cap_unlink(vfs_handle_struct *handle,
return ret;
}
-static int cap_chmod(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int cap_chmod(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- char *cappath = capencode(talloc_tos(), path);
+ struct smb_filename *cap_smb_fname = NULL;
+ char *cappath = capencode(talloc_tos(), smb_fname->base_name);
+ int ret;
+ int saved_errno;
if (!cappath) {
errno = ENOMEM;
return -1;
}
- return SMB_VFS_NEXT_CHMOD(handle, cappath, mode);
+
+ cap_smb_fname = synthetic_smb_fname(talloc_tos(),
+ cappath,
+ NULL,
+ NULL);
+ if (cap_smb_fname == NULL) {
+ TALLOC_FREE(cappath);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ ret = SMB_VFS_NEXT_CHMOD(handle, cap_smb_fname, mode);
+ saved_errno = errno;
+ TALLOC_FREE(cappath);
+ TALLOC_FREE(cap_smb_fname);
+ errno = saved_errno;
+ return ret;
}
static int cap_chown(vfs_handle_struct *handle, const char *path, uid_t uid,
gid_t gid)
@@ -440,16 +461,36 @@ static char *cap_realpath(vfs_handle_struct *handle,
const char *path)
return SMB_VFS_NEXT_REALPATH(handle, cappath);
}
-static int cap_chmod_acl(vfs_handle_struct *handle, const char *path, mode_t
mode)
+static int cap_chmod_acl(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- char *cappath = capencode(talloc_tos(), path);
+ struct smb_filename *cap_smb_fname = NULL;
+ char *cappath = capencode(talloc_tos(), smb_fname->base_name);
+ int ret;
+ int saved_errno;
/* If the underlying VFS doesn't have ACL support... */
if (!cappath) {
errno = ENOMEM;
return -1;
}
- return SMB_VFS_NEXT_CHMOD_ACL(handle, cappath, mode);
+ cap_smb_fname = synthetic_smb_fname(talloc_tos(),
+ cappath,
+ NULL,
+ NULL);
+ if (cap_smb_fname == NULL) {
+ TALLOC_FREE(cappath);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ ret = SMB_VFS_NEXT_CHMOD_ACL(handle, cap_smb_fname, mode);
+ saved_errno = errno;
+ TALLOC_FREE(cappath);
+ TALLOC_FREE(cap_smb_fname);
+ errno = saved_errno;
+ return ret;
}
static SMB_ACL_T cap_sys_acl_get_file(vfs_handle_struct *handle,
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index 9f42e5f..e142cce 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -565,22 +565,39 @@ static int catia_lchown(vfs_handle_struct *handle,
return ret;
}
-static int catia_chmod(vfs_handle_struct *handle, const char *path, mode_t
mode)
+static int catia_chmod(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
char *name = NULL;
NTSTATUS status;
int ret;
+ int saved_errno;
+ struct smb_filename *catia_smb_fname = NULL;
- status = catia_string_replace_allocate(handle->conn, path,
- &name, vfs_translate_to_unix);
+ status = catia_string_replace_allocate(handle->conn,
+ smb_fname->base_name,
+ &name,
+ vfs_translate_to_unix);
if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
return -1;
}
+ catia_smb_fname = synthetic_smb_fname(talloc_tos(),
+ name,
+ NULL,
+ NULL);
+ if (catia_smb_fname == NULL) {
+ TALLOC_FREE(name);
+ errno = ENOMEM;
+ return -1;
+ }
- ret = SMB_VFS_NEXT_CHMOD(handle, name, mode);
+ ret = SMB_VFS_NEXT_CHMOD(handle, catia_smb_fname, mode);
+ saved_errno = errno;
TALLOC_FREE(name);
-
+ TALLOC_FREE(catia_smb_fname);
+ errno = saved_errno;
return ret;
}
@@ -854,22 +871,38 @@ catia_get_nt_acl(struct vfs_handle_struct *handle,
static int
catia_chmod_acl(vfs_handle_struct *handle,
- const char *path,
+ const struct smb_filename *smb_fname,
mode_t mode)
{
char *mapped_name = NULL;
+ struct smb_filename *mapped_smb_fname = NULL;
NTSTATUS status;
int ret;
+ int saved_errno;
status = catia_string_replace_allocate(handle->conn,
- path, &mapped_name, vfs_translate_to_unix);
+ smb_fname->base_name,
+ &mapped_name,
+ vfs_translate_to_unix);
if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
return -1;
}
- ret = SMB_VFS_NEXT_CHMOD_ACL(handle, mapped_name, mode);
+ mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
+ mapped_name,
+ NULL,
+ NULL);
+ if (mapped_smb_fname == NULL) {
+ TALLOC_FREE(mapped_name);
+ errno = ENOMEM;
+ return -1;
+ }
+ ret = SMB_VFS_NEXT_CHMOD_ACL(handle, mapped_smb_fname, mode);
+ saved_errno = errno;
TALLOC_FREE(mapped_name);
+ TALLOC_FREE(mapped_smb_fname);
+ errno = saved_errno;
return ret;
}
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 2e1b623..82e15c8 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -362,8 +362,10 @@ static int cephwrap_mkdir(struct vfs_handle_struct *handle,
* mess up any inherited ACL bits that were set. JRA.
*/
int saved_errno = errno; /* We may get ENOSYS */
- if ((SMB_VFS_CHMOD_ACL(handle->conn, path, mode) == -1) &&
(errno == ENOSYS))
+ if ((SMB_VFS_CHMOD_ACL(handle->conn, smb_fname, mode) == -1) &&
+ (errno == ENOSYS)) {
errno = saved_errno;
+ }
}
return result;
@@ -629,11 +631,16 @@ static int cephwrap_unlink(struct vfs_handle_struct
*handle,
WRAP_RETURN(result);
}
-static int cephwrap_chmod(struct vfs_handle_struct *handle, const char *path,
mode_t mode)
+static int cephwrap_chmod(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
- DEBUG(10, ("[CEPH] chmod(%p, %s, %d)\n", handle, path, mode));
+ DEBUG(10, ("[CEPH] chmod(%p, %s, %d)\n",
+ handle,
+ smb_fname->base_name,
+ mode));
/*
* We need to do this due to the fact that the default POSIX ACL
@@ -644,14 +651,17 @@ static int cephwrap_chmod(struct vfs_handle_struct
*handle, const char *path, m
{
int saved_errno = errno; /* We might get ENOSYS */
- if ((result = SMB_VFS_CHMOD_ACL(handle->conn, path, mode)) ==
0) {
+ result = SMB_VFS_CHMOD_ACL(handle->conn,
+ smb_fname,
+ mode);
+ if (result == 0) {
return result;
}
/* Error - return the old errno. */
errno = saved_errno;
}
- result = ceph_chmod(handle->data, path, mode);
+ result = ceph_chmod(handle->data, smb_fname->base_name, mode);
DEBUG(10, ("[CEPH] chmod(...) = %d\n", result));
WRAP_RETURN(result);
}
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 64592a7..bb55fac 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -498,8 +498,10 @@ static int vfswrap_mkdir(vfs_handle_struct *handle,
* mess up any inherited ACL bits that were set. JRA.
*/
int saved_errno = errno; /* We may get ENOSYS */
- if ((SMB_VFS_CHMOD_ACL(handle->conn, path, mode) == -1) &&
(errno == ENOSYS))
+ if ((SMB_VFS_CHMOD_ACL(handle->conn, smb_fname, mode) == -1) &&
+ (errno == ENOSYS)) {
errno = saved_errno;
+ }
}
END_PROFILE(syscall_mkdir);
@@ -1676,7 +1678,9 @@ static int vfswrap_unlink(vfs_handle_struct *handle,
return result;
}
-static int vfswrap_chmod(vfs_handle_struct *handle, const char *path, mode_t
mode)
+static int vfswrap_chmod(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
@@ -1691,7 +1695,10 @@ static int vfswrap_chmod(vfs_handle_struct *handle,
const char *path, mode_t mod
--
Samba Shared Repository
