svn commit: samba r5624 - in trunk/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-03-02 18:19:38 +0000 (Wed, 02 Mar 2005)
New Revision: 5624

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5624

Log:
Horrible band-aid patch to fix Blue-Arc torture tester.
I know this isn't right but will work until I can refactor
the deny mode code with the Samba4 algorithm.
Jeremy.

Modified:
   trunk/source/smbd/open.c


Changeset:
Modified: trunk/source/smbd/open.c
===================================================================
--- trunk/source/smbd/open.c	2005-03-02 18:19:32 UTC (rev 5623)
+++ trunk/source/smbd/open.c	2005-03-02 18:19:38 UTC (rev 5624)
@@ -491,7 +491,13 @@
 		unix_ERR_class = ERRDOS;
 		unix_ERR_code = ERRbadshare;
 		unix_ERR_ntstatus = NT_STATUS_SHARING_VIOLATION;
+		return False;
+	}
 
+	if (deny_mode == DENY_ALL || old_deny_mode == DENY_ALL) {
+		unix_ERR_class = ERRDOS;
+		unix_ERR_code = ERRbadshare;
+		unix_ERR_ntstatus = NT_STATUS_SHARING_VIOLATION;
 		return False;
 	}
 
@@ -502,7 +508,7 @@
 
 	if ( !(desired_access & (FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_EXECUTE)) ||
 		!(share->desired_access & (FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_EXECUTE)) ) {
-		DEBUG(5,("check_share_mode: Allowing open on file %s as desired access (0x%x) doesn't conflict with\
+		DEBUG(5,("check_share_mode: Allowing open on file %s as desired access (0x%x) doesn't conflict with \
 existing desired access (0x%x).\n", fname, (unsigned int)desired_access, (unsigned int)share->desired_access ));
 		return True;
 	}