diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-05-12 17:38:10 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-05-12 17:52:00 -0700 |
| commit | c2482d6b23f769d8a5fa4141f9540a25c985d7cc (patch) | |
| tree | b6bd7fe05ae8da341dc55d56b1bb76329c6661cb /source3/modules/onefs_system.c | |
| parent | c60bb39df355c2ef36e4cfdff69cc348adc6dae1 (diff) | |
| download | samba-c2482d6b23f769d8a5fa4141f9540a25c985d7cc.tar.gz samba-c2482d6b23f769d8a5fa4141f9540a25c985d7cc.tar.bz2 samba-c2482d6b23f769d8a5fa4141f9540a25c985d7cc.zip | |
s3 onefs: Fix ignore sacl parameter
Diffstat (limited to 'source3/modules/onefs_system.c')
| -rw-r--r-- | source3/modules/onefs_system.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c index 22ef2f481b..3e51c6cd85 100644 --- a/source3/modules/onefs_system.c +++ b/source3/modules/onefs_system.c @@ -94,7 +94,7 @@ int onefs_sys_create_file(connection_struct *conn, enum oplock_type onefs_oplock; enum oplock_type onefs_granted_oplock = OPLOCK_NONE; struct ifs_security_descriptor ifs_sd = {}, *pifs_sd = NULL; - int secinfo = 0; + uint32_t sec_info_effective = 0; int ret_fd = -1; uint32_t onefs_dos_attributes; struct ifs_createfile_flags cf_flags = CF_FLAGS_NONE; @@ -104,10 +104,12 @@ int onefs_sys_create_file(connection_struct *conn, /* Setup security descriptor and get secinfo. */ if (sd != NULL) { NTSTATUS status; + uint32_t sec_info_sent = 0; - secinfo = (get_sec_info(sd) & IFS_SEC_INFO_KNOWN_MASK); + sec_info_sent = (get_sec_info(sd) & IFS_SEC_INFO_KNOWN_MASK); - status = onefs_samba_sd_to_sd(secinfo, sd, &ifs_sd, SNUM(conn)); + status = onefs_samba_sd_to_sd(sec_info_sent, sd, &ifs_sd, + SNUM(conn), &sec_info_effective); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("SD initialization failure: %s\n", @@ -172,7 +174,7 @@ int onefs_sys_create_file(connection_struct *conn, (unsigned int)mode, onefs_oplock_str(onefs_oplock), (unsigned int)id, - (unsigned int)secinfo, sd, + sec_info_effective, sd, (unsigned int)onefs_dos_attributes, path, cf_flags_and_bool(cf_flags, CF_FLAGS_DEFAULT_ACL) ? "true" : "false")); @@ -188,8 +190,8 @@ int onefs_sys_create_file(connection_struct *conn, ret_fd = ifs_createfile(base_fd, path, (enum ifs_ace_rights)open_access_mask, flags & ~O_ACCMODE, mode, - onefs_oplock, id, psml, secinfo, pifs_sd, onefs_dos_attributes, - cf_flags, &onefs_granted_oplock); + onefs_oplock, id, psml, sec_info_effective, pifs_sd, + onefs_dos_attributes, cf_flags, &onefs_granted_oplock); DEBUG(10,("onefs_sys_create_file(%s): ret_fd = %d, " "onefs_granted_oplock = %s\n", |