summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-10-26 15:30:00 -0700
committerJeremy Allison <jra@samba.org>2011-10-28 12:16:42 -0700
commit8a65e2c747c17be023d8c1285e0c8b2394fd4354 (patch)
tree7fb192844d050b06c0eb69d4dd77066f02970ce6
parentea195b6cd2152a7f09847dba9c0c2288cc9a862d (diff)
downloadsamba-8a65e2c747c17be023d8c1285e0c8b2394fd4354.tar.gz
samba-8a65e2c747c17be023d8c1285e0c8b2394fd4354.tar.bz2
samba-8a65e2c747c17be023d8c1285e0c8b2394fd4354.zip
Remove unused "struct security_descriptor" parameter from check_parent_access()
-rw-r--r--source3/smbd/open.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ba14f3d51f..6dab55d100 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -204,8 +204,7 @@ static NTSTATUS smbd_check_open_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,
- struct security_descriptor **pp_parent_sd)
+ char **pp_parent_dir)
{
NTSTATUS status;
char *parent_dir = NULL;
@@ -252,9 +251,6 @@ static NTSTATUS check_parent_access(struct connection_struct *conn,
if (pp_parent_dir) {
*pp_parent_dir = parent_dir;
}
- if (pp_parent_sd) {
- *pp_parent_sd = parent_sd;
- }
return NT_STATUS_OK;
}
@@ -624,7 +620,6 @@ static NTSTATUS open_file(files_struct *fsp,
status = check_parent_access(conn,
smb_fname,
SEC_DIR_ADD_FILE,
- NULL,
NULL);
} else {
/* File didn't exist and no O_CREAT. */
@@ -2571,8 +2566,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
status = check_parent_access(conn,
smb_dname,
access_mask,
- &parent_dir,
- NULL);
+ &parent_dir);
if(!NT_STATUS_IS_OK(status)) {
DEBUG(5,("mkdir_internal: check_parent_access "
"on directory %s for path %s returned %s\n",