summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-06-26 00:47:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:03 -0500
commit7f05a7d0c85fd3deaf5e3e263cf8b0f05d4a7f01 (patch)
tree1c27279f98198e128b8e93e1833670dca0513b41 /source3/smbd
parente13ba6ebd51c1a34fab07368bc45fa165eaa6b95 (diff)
downloadsamba-7f05a7d0c85fd3deaf5e3e263cf8b0f05d4a7f01.tar.gz
samba-7f05a7d0c85fd3deaf5e3e263cf8b0f05d4a7f01.tar.bz2
samba-7f05a7d0c85fd3deaf5e3e263cf8b0f05d4a7f01.zip
r1260: Added new parameter in the protocol section. "defer sharing violations",
by default set to "yes" (to correctly emulate Windows). I've added this to ensure if we find a critical problem with this new code when 3.0.5 ships it can be turned off to test for bugs. Jeremy. (This used to be commit bee0619cc476335e19a5f76179832802587563d1)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 330080353c..119eb04e09 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -786,6 +786,10 @@ static void delete_defered_open_entry_record(connection_struct *conn, SMB_DEV_T
deferred_open_entry *de_array = NULL;
int num_de_entries, i;
+ if (!lp_defer_sharing_violations(SNUM(conn))) {
+ return;
+ }
+
num_de_entries = get_deferred_opens(conn, dev, inode, &de_array);
for (i = 0; i < num_de_entries; i++) {
deferred_open_entry *entry = &de_array[i];
@@ -814,6 +818,10 @@ void defer_open_sharing_error(connection_struct *conn, struct timeval *ptv,
int num_de_entries, i;
struct dev_inode_bundle dib;
+ if (!lp_defer_sharing_violations(SNUM(conn))) {
+ return;
+ }
+
dib.dev = dev;
dib.inode = inode;