diff options
| author | Jeremy Allison <jra@samba.org> | 2001-01-11 23:41:33 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-01-11 23:41:33 +0000 |
| commit | cffc311b8a897641166728f27464ba7d37a2092c (patch) | |
| tree | 35a337d4fea2f16407bf76502dfb972ccc93efba /source3/smbd | |
| parent | ea1e6f9e7bc845ddf93a1603d7e43050be0e7917 (diff) | |
| download | samba-cffc311b8a897641166728f27464ba7d37a2092c.tar.gz samba-cffc311b8a897641166728f27464ba7d37a2092c.tar.bz2 samba-cffc311b8a897641166728f27464ba7d37a2092c.zip | |
Fixed typo with acl_set_fd() not needing an ACL_TYPE_T parameter.
Ensure HAVE_NO_ACLS is set in configure if ACL support not selected.
Jeremy
(This used to be commit 523c91935621ec2d200a79385046694806f7c837)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/posix_acls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 10fbdf7bca..8890d54da0 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -933,14 +933,14 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau * Finally apply it to the file or directory. */ - if(fsp->is_directory || fsp->fd == -1) { + if(default_ace || fsp->is_directory || fsp->fd == -1) { if (sys_acl_set_file(fsp->fsp_name, the_acl_type, the_acl) == -1) { DEBUG(0,("set_canon_ace_list: sys_acl_set_file failed for file %s (%s).\n", fsp->fsp_name, strerror(errno) )); goto done; } } else { - if (sys_acl_set_fd(fsp->fd, the_acl_type, the_acl) == -1) { + if (sys_acl_set_fd(fsp->fd, the_acl) == -1) { DEBUG(0,("set_canon_ace_list: sys_acl_set_file failed for file %s (%s).\n", fsp->fsp_name, strerror(errno) )); goto done; |