[Pkg-samba-maint] r2671 - in branches/samba/lenny/debian: . patches

[bubulle at alioth.debian.org]

tags 520284 pending
thanks

Author: bubulle
Date: 2009-03-22 16:52:04 +0000 (Sun, 22 Mar 2009)
New Revision: 2671

Added:
   branches/samba/lenny/debian/patches/bug_520284_upstream_6160.patch
Modified:
   branches/samba/lenny/debian/changelog
   branches/samba/lenny/debian/patches/series
Log:
Allow Office 2007 to save files on Samba-mapped drives

Modified: branches/samba/lenny/debian/changelog
===================================================================
--- branches/samba/lenny/debian/changelog	2009-03-22 10:43:54 UTC (rev 2670)
+++ branches/samba/lenny/debian/changelog	2009-03-22 16:52:04 UTC (rev 2671)
@@ -1,6 +1,7 @@
 samba (2:3.2.5-4lenny2) UNRELEASED; urgency=low
 
   * Do not abort rename process on valid rename script. Closes: #519974
+  * Allow Office 2007 to save files on Samba-mapped drives. Closes: #520284
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 22 Mar 2009 11:42:53 +0100
 

Added: branches/samba/lenny/debian/patches/bug_520284_upstream_6160.patch
===================================================================
--- branches/samba/lenny/debian/patches/bug_520284_upstream_6160.patch	                        (rev 0)
+++ branches/samba/lenny/debian/patches/bug_520284_upstream_6160.patch	2009-03-22 16:52:04 UTC (rev 2671)
@@ -0,0 +1,48 @@
+Goal: allow Office 2007 to save files on Samba-mapped drives
+
+Fixes: #520284
+
+Status wrt upstream: Fixed in 3.3.1
+
+Author: Jeremy Allison <jra at samba.org>
+
+Index: lenny/source/smbd/open.c
+===================================================================
+--- lenny.orig/source/smbd/open.c
++++ lenny/source/smbd/open.c
+@@ -2126,6 +2126,14 @@
+ 		return NT_STATUS_NOT_A_DIRECTORY;
+ 	}
+ 
++	/* We need to support SeSecurityPrivilege for this. */
++	if (access_mask & SEC_RIGHT_SYSTEM_SECURITY) {
++		DEBUG(10, ("open_directory: open on %s "
++			"failed - SEC_RIGHT_SYSTEM_SECURITY denied.\n",
++			fname));
++		return NT_STATUS_PRIVILEGE_NOT_HELD;
++	}
++
+ 	switch( create_disposition ) {
+ 		case FILE_OPEN:
+ 
+@@ -2677,6 +2685,20 @@
+ 		status = NT_STATUS_PRIVILEGE_NOT_HELD;
+ 		goto fail;
+ 	}
++#else
++	/* We need to support SeSecurityPrivilege for this. */
++	if (access_mask & SEC_RIGHT_SYSTEM_SECURITY) {
++		status = NT_STATUS_PRIVILEGE_NOT_HELD;
++		goto fail;
++	}
++	/* Don't allow a SACL set from an NTtrans create until we
++	 * support SeSecurityPrivilege. */
++	if (!VALID_STAT(sbuf) &&
++			lp_nt_acl_support(SNUM(conn)) &&
++			sd && (sd->sacl != NULL)) {
++		status = NT_STATUS_PRIVILEGE_NOT_HELD;
++		goto fail;
++	}
+ #endif
+ 
+ 	if ((conn->fs_capabilities & FILE_NAMED_STREAMS)

Modified: branches/samba/lenny/debian/patches/series
===================================================================
--- branches/samba/lenny/debian/patches/series	2009-03-22 10:43:54 UTC (rev 2670)
+++ branches/samba/lenny/debian/patches/series	2009-03-22 16:52:04 UTC (rev 2671)
@@ -26,3 +26,4 @@
 bug_514151_upstream_5825.patch
 bug_514703_upstream_6021.patch
 bug_519974_upstream_5957.patch
+bug_520284_upstream_6160.patch