diff options
author | Michael Adam <obnox@samba.org> | 2008-01-08 11:29:09 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2008-01-08 11:29:09 +0100 |
commit | 1590dd32cfccd9ce73cd798330b5207bcc48bfaf (patch) | |
tree | 0c1336d1d9a7870bee5a8c1206a9af38856a9c74 /source3/smbd | |
parent | 9f691df852581b1ae4fab7cb9907606f4dcab291 (diff) | |
download | samba-1590dd32cfccd9ce73cd798330b5207bcc48bfaf.tar.gz samba-1590dd32cfccd9ce73cd798330b5207bcc48bfaf.tar.bz2 samba-1590dd32cfccd9ce73cd798330b5207bcc48bfaf.zip |
Remove redundant parameter fd from SMB_VFS_FREMOVEXATTR().
Michael
(This used to be commit bfc3b5a27f707d3e4b8d5d66192891e22365fbb3)
Diffstat (limited to 'source3/smbd')
-rw-r--r-- | source3/smbd/posix_acls.c | 2 | ||||
-rw-r--r-- | source3/smbd/trans2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index be05ebd2ab..120e82c4b0 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -229,7 +229,7 @@ static void store_inheritance_attributes(files_struct *fsp, canon_ace *file_ace_ if (!pai_protected && num_inherited_entries(file_ace_list) == 0 && num_inherited_entries(dir_ace_list) == 0) { /* Instead just remove the attribute if it exists. */ if (fsp->fh->fd != -1) - SMB_VFS_FREMOVEXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME); + SMB_VFS_FREMOVEXATTR(fsp, SAMBA_POSIX_INHERITANCE_EA_NAME); else SMB_VFS_REMOVEXATTR(fsp->conn, fsp->fsp_name, SAMBA_POSIX_INHERITANCE_EA_NAME); return; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 2958985b02..c20d930433 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -355,7 +355,7 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp, const char *fname, s if (fsp && (fsp->fh->fd != -1)) { DEBUG(10,("set_ea: deleting ea name %s on file %s by file descriptor.\n", unix_ea_name, fsp->fsp_name)); - ret = SMB_VFS_FREMOVEXATTR(fsp, fsp->fh->fd, unix_ea_name); + ret = SMB_VFS_FREMOVEXATTR(fsp, unix_ea_name); } else { DEBUG(10,("set_ea: deleting ea name %s on file %s.\n", unix_ea_name, fname)); |