summaryrefslogtreecommitdiff
path: root/source3/modules/onefs_acl.c
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-05-28 14:11:43 -0700
committerTim Prouty <tprouty@samba.org>2009-05-28 15:13:53 -0700
commit5c623e6c2e787cad6efde036161e8a2f816d5203 (patch)
treec45b71924a04a12edc19d2c5225cb305137dd935 /source3/modules/onefs_acl.c
parent0a455c12840cfb3ac23ee9fa0b79ebcc86a768da (diff)
downloadsamba-5c623e6c2e787cad6efde036161e8a2f816d5203.tar.gz
samba-5c623e6c2e787cad6efde036161e8a2f816d5203.tar.bz2
samba-5c623e6c2e787cad6efde036161e8a2f816d5203.zip
s3 onefs: update the onefs module to be compliant with stat_ex
Diffstat (limited to 'source3/modules/onefs_acl.c')
-rw-r--r--source3/modules/onefs_acl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index d66e5d65fa..81bdfd26cc 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -393,7 +393,7 @@ onefs_canon_acl(files_struct *fsp, struct ifs_security_descriptor *sd)
if (error)
return false;
- if ((sbuf.st_flags & SF_HASNTFSACL) != 0) {
+ if ((sbuf.st_ex_flags & SF_HASNTFSACL) != 0) {
DEBUG(10, ("Did not canonicalize ACLs because a "
"Windows ACL set was found for file %s\n",
fsp->fsp_name));
@@ -540,7 +540,8 @@ static bool add_sfs_aces(files_struct *fsp, struct ifs_security_descriptor *sd)
}
/* Only continue if this is a synthetic ACL and a directory. */
- if (S_ISDIR(sbuf.st_mode) && (sbuf.st_flags & SF_HASNTFSACL) == 0) {
+ if (S_ISDIR(sbuf.st_ex_mode) &&
+ (sbuf.st_ex_flags & SF_HASNTFSACL) == 0) {
struct ifs_ace new_aces[6];
struct ifs_ace *old_aces;
int i, num_aces_to_add = 0;