diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_open.c | 6 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_tdb.c | 5 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_xattr.c | 5 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index d0310d0174..a4a317d905 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -462,8 +462,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn, return print_fsp_open(req, conn, fname, req->vuid, fsp); } - if (!parent_dirname_talloc(talloc_tos(), fname, &parent_dir, - &newname)) { + if (!parent_dirname(talloc_tos(), fname, &parent_dir, &newname)) { return NT_STATUS_NO_MEMORY; } @@ -1339,8 +1338,7 @@ static NTSTATUS onefs_open_directory(connection_struct *conn, } /* Get parent dirname */ - if (!parent_dirname_talloc(talloc_tos(), fname, &parent_dir, - &dirname)) { + if (!parent_dirname(talloc_tos(), fname, &parent_dir, &dirname)) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 9cb887ae51..3d140e34c2 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -433,10 +433,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, size_t size; char *parent_name; - if (!parent_dirname_talloc(ctx, - fname, - &parent_name, - NULL)) { + if (!parent_dirname(ctx, fname, &parent_name, NULL)) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index 3c8f241ad9..7c78b506f0 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -328,10 +328,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, size_t size; char *parent_name; - if (!parent_dirname_talloc(ctx, - fname, - &parent_name, - NULL)) { + if (!parent_dirname(ctx, fname, &parent_name, NULL)) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 3171d3c5ca..61e1deb81e 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -155,7 +155,7 @@ static int vfswrap_mkdir(vfs_handle_struct *handle, const char *path, mode_t mo START_PROFILE(syscall_mkdir); if (lp_inherit_acls(SNUM(handle->conn)) - && parent_dirname_talloc(talloc_tos(), path, &parent, NULL) + && parent_dirname(talloc_tos(), path, &parent, NULL) && (has_dacl = directory_has_default_acl(handle->conn, parent))) mode = 0777; |