Attachment 8286 Details for Bug 9462 – git-am fix for master and 4.0.0

[patch] git-am fix for master and 4.0.0

9462.patchset (text/plain), 9.03 KB, created by Jeremy Allison on 2012-12-05 20:25:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-12-05 20:25:38 UTC

Size: 9.03 KB

patch

obsolete

>From 930fe79102e48f1c62418c95249a4ad006c9acb3 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 5 Dec 2012 12:23:40 -0800
>Subject: [PATCH 1/2] Don't use any masks when setting an ACL, simply ensure
> user has r-- (or r-x for directories).
>
>Part of fix for bug #9462 - Users can not be given write permissions any more by default
>---
> source3/smbd/posix_acls.c |   37 +++++--------------------------------
> 1 files changed, 5 insertions(+), 32 deletions(-)
>
>diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
>index 4e93fef..74116c1 100644
>--- a/source3/smbd/posix_acls.c
>+++ b/source3/smbd/posix_acls.c
>@@ -1236,47 +1236,20 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn,
> }
> 
> /****************************************************************************
>- Ensure the enforced permissions for this share apply.
>+ Ensure the enforced permissions apply.
> ****************************************************************************/
> 
> static void apply_default_perms(const struct share_params *params,
> 				const bool is_directory, canon_ace *pace,
> 				mode_t type)
> {
>-	mode_t and_bits = (mode_t)0;
>-	mode_t or_bits = (mode_t)0;
>-
>-	/* Get the initial bits to apply. */
>-
>-	if (is_directory) {
>-		and_bits = lp_dir_mask(params->service);
>-		or_bits = lp_force_dir_mode(params->service);
>-	} else {
>-		and_bits = lp_create_mask(params->service);
>-		or_bits = lp_force_create_mode(params->service);
>-	}
>-
>-	/* Now bounce them into the S_USR space. */	
>-	switch(type) {
>-	case S_IRUSR:
>-		/* Ensure owner has read access. */
>+	/* Ensure owner has read access. */
>+	if (type == S_IRUSR) {
> 		pace->perms |= S_IRUSR;
>-		if (is_directory)
>+		if (is_directory) {
> 			pace->perms |= (S_IWUSR|S_IXUSR);
>-		and_bits = unix_perms_to_acl_perms(and_bits, S_IRUSR, S_IWUSR, S_IXUSR);
>-		or_bits = unix_perms_to_acl_perms(or_bits, S_IRUSR, S_IWUSR, S_IXUSR);
>-		break;
>-	case S_IRGRP:
>-		and_bits = unix_perms_to_acl_perms(and_bits, S_IRGRP, S_IWGRP, S_IXGRP);
>-		or_bits = unix_perms_to_acl_perms(or_bits, S_IRGRP, S_IWGRP, S_IXGRP);
>-		break;
>-	case S_IROTH:
>-		and_bits = unix_perms_to_acl_perms(and_bits, S_IROTH, S_IWOTH, S_IXOTH);
>-		or_bits = unix_perms_to_acl_perms(or_bits, S_IROTH, S_IWOTH, S_IXOTH);
>-		break;
>+		}
> 	}
>-
>-	pace->perms = ((pace->perms & and_bits)|or_bits);
> }
> 
> /****************************************************************************
>-- 
>1.7.7.3
>
>
>From 8cbd02c66ddae7f635a73aa68beed26d8302ac4b Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 4 Dec 2012 15:47:06 -0800
>Subject: [PATCH 2/2] Documentation fixes for bug #9462 - Users can not be
> given write permissions any more by default
>
>Ensure we don't apply the masks + force modes on security setting
>changes, only on create.
>---
> docs-xml/smbdotconf/security/createmask.xml        |    5 -----
> docs-xml/smbdotconf/security/directorymask.xml     |    5 -----
> .../smbdotconf/security/directorysecuritymask.xml  |    4 +---
> docs-xml/smbdotconf/security/forcecreatemode.xml   |    6 ------
> .../smbdotconf/security/forcedirectorymode.xml     |    6 ------
> .../security/forcedirectorysecuritymode.xml        |    5 +----
> docs-xml/smbdotconf/security/forcesecuritymode.xml |    5 +----
> docs-xml/smbdotconf/security/securitymask.xml      |    4 +---
> 8 files changed, 4 insertions(+), 36 deletions(-)
>
>diff --git a/docs-xml/smbdotconf/security/createmask.xml b/docs-xml/smbdotconf/security/createmask.xml
>index 59e208d..5df0718 100644
>--- a/docs-xml/smbdotconf/security/createmask.xml
>+++ b/docs-xml/smbdotconf/security/createmask.xml
>@@ -26,11 +26,6 @@
> 	This parameter does not affect directory masks. See the parameter <smbconfoption name="directory mask"/>
> 	for details.
> 	</para>
>-
>-    <para>
>-	New in Samba 4.0.0. This mask is applied whenever permissions are changed on a file. To allow clients full control
>-	over permission changes it should be set to 0777.
>-	</para>
> </description>
> 
> <related>force create mode</related>
>diff --git a/docs-xml/smbdotconf/security/directorymask.xml b/docs-xml/smbdotconf/security/directorymask.xml
>index 2ebfc16..b17625c 100644
>--- a/docs-xml/smbdotconf/security/directorymask.xml
>+++ b/docs-xml/smbdotconf/security/directorymask.xml
>@@ -23,11 +23,6 @@
>     <para>Following this Samba will bit-wise 'OR' the UNIX mode 
>     created from this parameter with the value of the <smbconfoption name="force directory mode"/> parameter. 
>     This parameter is set to 000 by default (i.e. no extra mode bits are added).</para>
>-
>-    <para>
>-    New in Samba 4.0.0. This mask is applied whenever permissions are changed on a directory. To allow clients full control
>-    over permission changes it should be set to 0777.
>-    </para>
> </description>
> 
> <related>force directory mode</related>
>diff --git a/docs-xml/smbdotconf/security/directorysecuritymask.xml b/docs-xml/smbdotconf/security/directorysecuritymask.xml
>index c5c8c65..ad208f4 100644
>--- a/docs-xml/smbdotconf/security/directorysecuritymask.xml
>+++ b/docs-xml/smbdotconf/security/directorysecuritymask.xml
>@@ -5,9 +5,7 @@
> 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
> <description>
>     <para>
>-	This parameter has been removed for Samba 4.0.0. The parameter
>-	<smbconfoption name="directory mask"/> is now used instead to mask
>-	any permission bit changes on directories.
>+	This parameter has been removed for Samba 4.0.0.
>     </para>
> </description>
> 
>diff --git a/docs-xml/smbdotconf/security/forcecreatemode.xml b/docs-xml/smbdotconf/security/forcecreatemode.xml
>index 5a57a29..a3f1c2c 100644
>--- a/docs-xml/smbdotconf/security/forcecreatemode.xml
>+++ b/docs-xml/smbdotconf/security/forcecreatemode.xml
>@@ -10,12 +10,6 @@
>     mode after the mask set in the <parameter moreinfo="none">create mask</parameter>
>     parameter is applied.</para>
> 
>-    <para>
>-    New in Samba 4.0.0. This mode is also 'OR'ed into the mode bits whenever
>-    permissions are changed on a file, not just when the file is created.
>-    This replaces the now removed <parameter moreinfo="none">force security mode</parameter>.
>-    </para>
>-
>     <para>The example below would force all newly created files to have read and execute
>     permissions set for 'group' and 'other' as well as the
>     read/write/execute bits set for the 'user'.</para>
>diff --git a/docs-xml/smbdotconf/security/forcedirectorymode.xml b/docs-xml/smbdotconf/security/forcedirectorymode.xml
>index e5b37ea..7effc0e 100644
>--- a/docs-xml/smbdotconf/security/forcedirectorymode.xml
>+++ b/docs-xml/smbdotconf/security/forcedirectorymode.xml
>@@ -12,12 +12,6 @@
>     mask in the parameter <parameter moreinfo="none">directory mask</parameter> is 
>     applied.</para>
> 
>-    <para>
>-    New in Samba 4.0.0. This mode is also 'OR'ed into the mode bits whenever
>-    permissions are changed on a directory, not just when the file is created.
>-    This replaces the now removed <parameter moreinfo="none">force directory security mode</parameter>.
>-    </para>
>-
> 	<para>The example below would force all created directories to have read and execute
>     permissions set for 'group' and 'other' as well as the
>     read/write/execute bits set for the 'user'.</para>
>diff --git a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
>index 3ea3b5c..a45395d 100644
>--- a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
>+++ b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
>@@ -5,10 +5,7 @@
> 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
> <description>
>     <para>
>-	This parameter has been removed for Samba 4.0.0. The parameter
>-	<smbconfoption name="force directory mode"/> is now used instead to
>-	force any permission changes on directories to include specific UNIX
>-	permission bits.
>+	This parameter has been removed for Samba 4.0.0.
>     </para>
> </description>
> </samba:parameter>
>diff --git a/docs-xml/smbdotconf/security/forcesecuritymode.xml b/docs-xml/smbdotconf/security/forcesecuritymode.xml
>index 2568bcc..5a9479e 100644
>--- a/docs-xml/smbdotconf/security/forcesecuritymode.xml
>+++ b/docs-xml/smbdotconf/security/forcesecuritymode.xml
>@@ -5,10 +5,7 @@
>                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
> <description>
>     <para>
>-	This parameter has been removed for Samba 4.0.0. The parameter
>-	<smbconfoption name="force create mode"/> is now used instead to
>-	force any permission changes on files to include specific UNIX
>-	permission bits.
>+	This parameter has been removed for Samba 4.0.0.
>     </para>
> </description>
> </samba:parameter>
>diff --git a/docs-xml/smbdotconf/security/securitymask.xml b/docs-xml/smbdotconf/security/securitymask.xml
>index cb7fcfa..e535d32 100644
>--- a/docs-xml/smbdotconf/security/securitymask.xml
>+++ b/docs-xml/smbdotconf/security/securitymask.xml
>@@ -5,9 +5,7 @@
>                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
> <description>
>     <para>
>-	This parameter has been removed for Samba 4.0.0. The parameter
>-	<smbconfoption name="create mask"/> is now used instead to mask
>-	any permission bit changes on files.
>+	This parameter has been removed for Samba 4.0.0.
>     </para>
> </description>
> </samba:parameter>
>-- 
>1.7.7.3
>

Actions: View

Attachments on bug 9462: 8280 | 8286 | 8287 | 8288 | 8289 | 8290 | 8292