diff options
| author | Jeremy Allison <jra@samba.org> | 2015-05-01 21:06:20 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-05-20 16:34:30 +0200 |
| commit | 8ac582e471753d44c25dd875a0969b90d418236f (patch) | |
| tree | 2a3091d9b607291fbbae06e865987bc8e312422c | |
| parent | 178db7cea5f33144b438c5e49ef65024e10d0a0f (diff) | |
| download | samba-8ac582e471753d44c25dd875a0969b90d418236f.tar.gz | |
s3: smbd: VFS: For all EA and ACL calls use synthetic_smb_fname(), not synthetic_smb_fname_split().
EA's and ACL paths are all post-stream name checks (and shouldn't
get stream names). This one took a *long* time to find.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11249
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit ccb4f791fd19d9b3af79a205a15c0219ed7240ea)
| -rw-r--r-- | source3/modules/non_posix_acls.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_fake_acls.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_xattr_tdb.c | 2 | ||||
| -rw-r--r-- | source3/smbd/posix_acls.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/non_posix_acls.c b/source3/modules/non_posix_acls.c index b1c24205d13..fca9979d649 100644 --- a/source3/modules/non_posix_acls.c +++ b/source3/modules/non_posix_acls.c @@ -32,7 +32,7 @@ int non_posix_sys_acl_blob_get_file_helper(vfs_handle_struct *handle, struct xattr_sys_acl_hash_wrapper acl_wrapper = {}; struct smb_filename *smb_fname; - smb_fname = synthetic_smb_fname_split(frame, path_p, NULL); + smb_fname = synthetic_smb_fname(frame, path_p, NULL, NULL); if (smb_fname == NULL) { TALLOC_FREE(frame); errno = ENOMEM; diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c index 0e7ebb9f659..f3c2ebbdba3 100644 --- a/source3/modules/vfs_fake_acls.c +++ b/source3/modules/vfs_fake_acls.c @@ -348,7 +348,7 @@ static int fake_acls_sys_acl_delete_def_file(vfs_handle_struct *handle, const ch TALLOC_CTX *frame = talloc_stackframe(); struct smb_filename *smb_fname; - smb_fname = synthetic_smb_fname_split(frame, path, NULL); + smb_fname = synthetic_smb_fname(frame, path, NULL, NULL); if (smb_fname == NULL) { TALLOC_FREE(frame); errno = ENOMEM; diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c index 590ffaad2d5..d72b50c0f69 100644 --- a/source3/modules/vfs_xattr_tdb.c +++ b/source3/modules/vfs_xattr_tdb.c @@ -37,7 +37,7 @@ static int xattr_tdb_get_file_id(struct vfs_handle_struct *handle, TALLOC_CTX *frame = talloc_stackframe(); struct smb_filename *smb_fname; - smb_fname = synthetic_smb_fname_split(frame, path, NULL); + smb_fname = synthetic_smb_fname(frame, path, NULL, NULL); if (smb_fname == NULL) { TALLOC_FREE(frame); errno = ENOMEM; diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index d187787e098..b926584288e 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -4747,7 +4747,7 @@ int posix_sys_acl_blob_get_file(vfs_handle_struct *handle, }; struct smb_filename *smb_fname; - smb_fname = synthetic_smb_fname_split(frame, path_p, NULL); + smb_fname = synthetic_smb_fname(frame, path_p, NULL, NULL); if (smb_fname == NULL) { TALLOC_FREE(frame); errno = ENOMEM; |