Revert "Change function signature of check_parent_access() to take char * instead...

This reverts commit a11c0a41a35aa2b1c14333552045a65e3e50df1e.

Not needed.

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index e8c24a0a68e71863f29f0b97274c2a7534b27b33..42edddcaf9cb9bbfa75e2a5e527850b8754370af 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -201,8 +201,8 @@ static NTSTATUS smbd_check_open_rights(struct connection_struct *conn,
        }
 }
 
-NTSTATUS check_parent_access(struct connection_struct *conn,
-                               const char *path,
+static NTSTATUS check_parent_access(struct connection_struct *conn,
+                               struct smb_filename *smb_fname,
                                uint32_t access_mask,
                                char **pp_parent_dir)
 {
@@ -212,7 +212,7 @@ NTSTATUS check_parent_access(struct connection_struct *conn,
        uint32_t access_granted = 0;
 
        if (!parent_dirname(talloc_tos(),
-                               path,
+                               smb_fname->base_name,
                                &parent_dir,
                                NULL)) {
                return NT_STATUS_NO_MEMORY;
@@ -241,7 +241,7 @@ NTSTATUS check_parent_access(struct connection_struct *conn,
                        "on directory %s for "
                        "path %s for mask 0x%x returned (0x%x) %s\n",
                        parent_dir,
-                       path,
+                       smb_fname->base_name,
                        access_mask,
                        access_granted,
                        nt_errstr(status) ));
@@ -618,7 +618,7 @@ static NTSTATUS open_file(files_struct *fsp,
                                                access_mask);
                        } else if (local_flags & O_CREAT){
                                status = check_parent_access(conn,
-                                               smb_fname->base_name,
+                                               smb_fname,
                                                SEC_DIR_ADD_FILE,
                                                NULL);
                        } else {
@@ -2564,7 +2564,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
        }
 
        status = check_parent_access(conn,
-                                       smb_dname->base_name,
+                                       smb_dname,
                                        access_mask,
                                        &parent_dir);
        if(!NT_STATUS_IS_OK(status)) {

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 351fc4992b7f347f129106805743ac7b71232998..343b0b916e50b845887c4f680b6dd7269d5f19c8 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -585,10 +585,6 @@ NTSTATUS smb1_file_se_access_check(connection_struct *conn,
                                const struct security_token *token,
                                uint32_t access_desired,
                                uint32_t *access_granted);
-NTSTATUS check_parent_access(struct connection_struct *conn,
-                               const char *path,
-                               uint32_t access_mask,
-                               char **pp_parent_dir);
 NTSTATUS fd_close(files_struct *fsp);
 void change_file_owner_to_parent(connection_struct *conn,
                                 const char *inherit_from_dir,