diff options
author | Jeremy Allison <jra@samba.org> | 2000-10-06 18:13:52 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2000-10-06 18:13:52 +0000 |
commit | ba00796e6dd13b87b7988a98e532676d9eab702c (patch) | |
tree | 6b53b1fae2ca229ab654bbff46b2e4dd7c4e489f /source3/smbd/unix_acls.c | |
parent | 08657e539e4cd4105057a9c12db30dbe4bbfcb1d (diff) | |
download | samba-ba00796e6dd13b87b7988a98e532676d9eab702c.tar.gz samba-ba00796e6dd13b87b7988a98e532676d9eab702c.tar.bz2 samba-ba00796e6dd13b87b7988a98e532676d9eab702c.zip |
Herb's warning fixes. Also the POSIX locking fix.
We now use our own vfs layer to do get/set acl calls (hurrah!).
Jeremy.
(This used to be commit dfe77c7046cbd65ee52aea7439f21503c1eac41d)
Diffstat (limited to 'source3/smbd/unix_acls.c')
-rw-r--r-- | source3/smbd/unix_acls.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source3/smbd/unix_acls.c b/source3/smbd/unix_acls.c index d32f1cfaae..2e16611b0c 100644 --- a/source3/smbd/unix_acls.c +++ b/source3/smbd/unix_acls.c @@ -352,15 +352,6 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc) sid_copy( &group_sid, &global_sid_World); } else { - /* - * If there is a VFS redirect, use it. - */ - - if ((fsp->is_directory || fsp->fd == -1) && fsp->conn->vfs_ops.get_nt_acl) - return fsp->conn->vfs_ops.get_nt_acl(fsp->conn,dos_to_unix(fsp->fsp_name, False), ppdesc); - else if (fsp->conn->vfs_ops.fget_nt_acl) - return fsp->conn->vfs_ops.fget_nt_acl(fsp,fsp->fd, ppdesc); - if(fsp->is_directory || fsp->fd == -1) { if(vfs_stat(fsp->conn,fsp->fsp_name, &sbuf) != 0) { return 0; @@ -463,15 +454,6 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd) BOOL got_dacl = False; /* - * If there is a VFS redirect, use it. - */ - - if ((fsp->is_directory || fsp->fd == -1) && fsp->conn->vfs_ops.set_nt_acl) - return fsp->conn->vfs_ops.set_nt_acl(conn,dos_to_unix(fsp->fsp_name, False), security_info_sent, psd); - else if (fsp->conn->vfs_ops.fset_nt_acl) - return fsp->conn->vfs_ops.fset_nt_acl(fsp,fsp->fd, security_info_sent, psd); - - /* * Get the current state of the file. */ |