diff options
author | Jeremy Allison <jra@samba.org> | 2007-02-06 21:05:34 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:47 -0500 |
commit | 7a5fa7f12ec439ef5a4af29aa86498f799b6b9a5 (patch) | |
tree | 611c3787938bb8eb77a127a18a4932890ae2fd03 /source3/param | |
parent | c04068a42b230541559939004f33d72f1e76f075 (diff) | |
download | samba-7a5fa7f12ec439ef5a4af29aa86498f799b6b9a5.tar.gz samba-7a5fa7f12ec439ef5a4af29aa86498f799b6b9a5.tar.bz2 samba-7a5fa7f12ec439ef5a4af29aa86498f799b6b9a5.zip |
r21191: Add in the POSIX open/mkdir/unlink calls.
Move more error code returns to NTSTATUS.
Client test code to follow... See if this
passes the build-farm before I add it into
3.0.25.
Jeremy.
(This used to be commit 83dbbdff345fa9e427c9579183f4380004bf3dd7)
Diffstat (limited to 'source3/param')
-rw-r--r-- | source3/param/loadparm.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f7dd30475a..d7b23f615f 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5589,17 +5589,23 @@ void lp_set_posix_pathnames(void) Global state for POSIX lock processing - CIFS unix extensions. ********************************************************************/ +BOOL posix_default_lock_was_set; static enum brl_flavour posix_cifsx_locktype; /* By default 0 == WINDOWS_LOCK */ -enum brl_flavour lp_posix_cifsu_locktype(void) +enum brl_flavour lp_posix_cifsu_locktype(files_struct *fsp) { - return posix_cifsx_locktype; + if (posix_default_lock_was_set) { + return posix_cifsx_locktype; + } else { + return fsp->posix_open ? POSIX_LOCK : WINDOWS_LOCK; + } } /******************************************************************* ********************************************************************/ -void lp_set_posix_cifsx_locktype(enum brl_flavour val) +void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val) { + posix_default_lock_was_set = True; posix_cifsx_locktype = val; } |