svn commit: samba r2548 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2004-09-23 00:19:18 +0000 (Thu, 23 Sep 2004)
New Revision: 2548

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/smbd&rev=2548&nolog=1

Log:
Fix for bug reported by Edward Spragins <spragins at gmail.com> - don't try to
set security descriptors on shares where this has been turned off.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/nttrans.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/nttrans.c	2004-09-23 00:10:40 UTC (rev 2547)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c	2004-09-23 00:19:18 UTC (rev 2548)
@@ -1080,7 +1080,7 @@
 	TALLOC_CTX *mem_ctx;
 	BOOL ret;
 	
-	if (sd_len == 0) {
+	if (sd_len == 0 || !lp_nt_acl_support(SNUM(fsp->conn))) {
 		return NT_STATUS_OK;
 	}
 
@@ -1414,7 +1414,8 @@
 	 * Now try and apply the desired SD.
 	 */
 
-	if (sd_len && !NT_STATUS_IS_OK(status = set_sd( fsp, data, sd_len, ALL_SECURITY_INFORMATION))) {
+	if (lp_nt_acl_support(SNUM(conn)) && sd_len &&
+			!NT_STATUS_IS_OK(status = set_sd( fsp, data, sd_len, ALL_SECURITY_INFORMATION))) {
 		close_file(fsp,False);
 		restore_case_semantics(conn, file_attributes);
 		return ERROR_NT(status);