diff options
| author | Volker Lendecke <vl@samba.org> | 2012-05-04 14:07:13 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2012-05-04 18:44:29 +0200 |
| commit | 7ae716663ad653e08d45eae5d66c55ef853b77f2 (patch) | |
| tree | 957f3cf280e92060695a8b4b2d52a2b120be6b71 | |
| parent | d12fa60ef8cab33eae2098c940dd27228697f9d2 (diff) | |
| download | samba-7ae716663ad653e08d45eae5d66c55ef853b77f2.tar.gz samba-7ae716663ad653e08d45eae5d66c55ef853b77f2.tar.bz2 samba-7ae716663ad653e08d45eae5d66c55ef853b77f2.zip | |
s3: Remove an unused parameter from check_parent_access()
| -rw-r--r-- | source3/smbd/open.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index b6e84eaec3..543a6619e9 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -207,8 +207,7 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn, static NTSTATUS check_parent_access(struct connection_struct *conn, struct smb_filename *smb_fname, - uint32_t access_mask, - char **pp_parent_dir) + uint32_t access_mask) { NTSTATUS status; char *parent_dir = NULL; @@ -222,10 +221,6 @@ static NTSTATUS check_parent_access(struct connection_struct *conn, return NT_STATUS_NO_MEMORY; } - if (pp_parent_dir) { - *pp_parent_dir = parent_dir; - } - if (get_current_uid(conn) == (uid_t)0) { /* I'm sorry sir, I didn't know you were root... */ DEBUG(10,("check_parent_access: root override " @@ -636,8 +631,7 @@ static NTSTATUS open_file(files_struct *fsp, } else if (local_flags & O_CREAT){ status = check_parent_access(conn, smb_fname, - SEC_DIR_ADD_FILE, - NULL); + SEC_DIR_ADD_FILE); } else { /* File didn't exist and no O_CREAT. */ return NT_STATUS_OBJECT_NAME_NOT_FOUND; @@ -2554,8 +2548,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn, status = check_parent_access(conn, smb_dname, - access_mask, - NULL); + access_mask); if(!NT_STATUS_IS_OK(status)) { DEBUG(5,("mkdir_internal: check_parent_access " "on directory %s for path %s returned %s\n", |