summaryrefslogtreecommitdiff
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2015-11-27 18:29:55 +0100
committerJeremy Allison <jra@samba.org>2015-12-01 20:45:20 +0100
commitd698cec1c7e700e57cab46d33df0dde13303b318 (patch)
treea223f4ae9a014c7be76e7cd3ebed7e8b42e48289 /source3/param/loadparm.c
parentd2a0806cbd24f6211b55a5454e2e62fc61a4c4b6 (diff)
downloadsamba-d698cec1c7e700e57cab46d33df0dde13303b318.tar.gz
s3:smbd: convert file_struct.posix_open to a bitmap with flags
This is in preperation of a more fine grained control of POSIX behaviour in the SMB and VFS layers. Inititally we use an uint8_t for the flags bitmap and add a define posix_flags as posix_open in order to avoid breaking the VFS ABI. Bug: https://bugzilla.samba.org/show_bug.cgi?id=11065 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e32cf73c72e..348298d4aba 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4311,7 +4311,8 @@ enum brl_flavour lp_posix_cifsu_locktype(files_struct *fsp)
if (posix_default_lock_was_set) {
return posix_cifsx_locktype;
} else {
- return fsp->posix_open ? POSIX_LOCK : WINDOWS_LOCK;
+ return (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?
+ POSIX_LOCK : WINDOWS_LOCK;
}
}