Attachment 1299 Details for Bug 2858 – patch

[patch] patch

samba3-doc-masks_and_modes.diff (text/plain), 5.86 KB, created by Björn Jacke on 2005-07-07 03:23:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2005-07-07 03:23:50 UTC

Size: 5.86 KB

patch

obsolete

>Index: manpages-3/smb.conf.5.xml
>===================================================================
>--- manpages-3/smb.conf.5.xml	(Revision 773)
>+++ manpages-3/smb.conf.5.xml	(Arbeitskopie)
>@@ -61,7 +61,7 @@
> 	<para>
> 	The values following the equals sign in parameters are all either a string (no quotes needed) or a boolean,
> 	which may be given as yes/no, 0/1 or true/false. Case is not significant in boolean values, but is preserved
>-	in string values. Some items such as create modes are numeric.
>+	in string values. Some items such as create masks are numeric.
> 	</para>
> 
> </refsect1>
>@@ -305,7 +305,7 @@
> 
> 	<para>
> 	Some parameters are specific to the [global] section (e.g., <emphasis>security</emphasis>).  Some parameters
>-	are usable in all sections (e.g., <emphasis>create mode</emphasis>). All others are permissible only in normal
>+	are usable in all sections (e.g., <emphasis>create mask</emphasis>). All others are permissible only in normal
> 	sections. For the purposes of the following descriptions the [homes] and [printers] sections will be
> 	considered normal.  The letter <emphasis>G</emphasis> in parentheses indicates that a parameter is specific to
> 	the [global] section. The letter <emphasis>S</emphasis> indicates that a parameter can be specified in a
>Index: smbdotconf/security/directorysecuritymask.xml
>===================================================================
>--- smbdotconf/security/directorysecuritymask.xml	(Revision 773)
>+++ smbdotconf/security/directorysecuritymask.xml	(Arbeitskopie)
>@@ -10,7 +10,11 @@
> 
>     <para>This parameter is applied as a mask (AND'ed with) to 
>     the changed permission bits, thus preventing any bits not in 
>-    this mask from being modified. Essentially, zero bits in this 
>+    this mask from being modified.
>+    Make sure not to mix up this parameter with
>+    <parameter moreinfo="none">force directory security mode</parameter>, 
>+    which works similar like this one but uses logical OR instead of AND.
>+    Essentially, zero bits in this 
>     mask may be treated as a set of bits the user is not allowed 
>     to change.</para>
> 
>Index: smbdotconf/security/forcedirectorysecuritymode.xml
>===================================================================
>--- smbdotconf/security/forcedirectorysecuritymode.xml	(Revision 773)
>+++ smbdotconf/security/forcedirectorysecuritymode.xml	(Arbeitskopie)
>@@ -9,7 +9,11 @@
> 
>     <para>This parameter is applied as a mask (OR'ed with) to the 
>     changed permission bits, thus forcing any bits in this mask that 
>-    the user may have modified to be on. Essentially, one bits in this 
>+    the user may have modified to be on.
>+    Make sure not to mix up this parameter with
>+    <parameter moreinfo="none">directory security mask</parameter>, 
>+    which works similar like this one but uses logical AND instead of OR.
>+    Essentially, one bits in this 
>     mask may be treated as a set of bits that, when modifying security 
>     on a directory, the user has always set to be 'on'.</para>
> 
>Index: smbdotconf/security/securitymask.xml
>===================================================================
>--- smbdotconf/security/securitymask.xml	(Revision 773)
>+++ smbdotconf/security/securitymask.xml	(Arbeitskopie)
>@@ -10,7 +10,11 @@
> 
>     <para>This parameter is applied as a mask (AND'ed with) to 
>     the changed permission bits, thus preventing any bits not in 
>-    this mask from being modified. Essentially, zero bits in this 
>+    this mask from being modified.
>+    Make sure not to mix up this parameter with
>+    <parameter moreinfo="none">force security mode</parameter>, 
>+    which works similar like this one but uses logical OR instead of AND.
>+    Essentially, zero bits in this 
>     mask may be treated as a set of bits the user is not allowed 
>     to change.</para>
> 
>Index: smbdotconf/security/directorymask.xml
>===================================================================
>--- smbdotconf/security/directorymask.xml	(Revision 773)
>+++ smbdotconf/security/directorymask.xml	(Arbeitskopie)
>@@ -30,7 +30,7 @@
> </description>
> 
> <related>force directory mode</related>
>-<related>create mode</related>
>+<related>create mask</related>
> <related>directory security mask</related>
> <related>inherit permissions</related>
> <value type="default">0755</value>
>Index: smbdotconf/security/forcesecuritymode.xml
>===================================================================
>--- smbdotconf/security/forcesecuritymode.xml	(Revision 773)
>+++ smbdotconf/security/forcesecuritymode.xml	(Arbeitskopie)
>@@ -10,7 +10,11 @@
> 		
>     <para>This parameter is applied as a mask (OR'ed with) to the 
>     changed permission bits, thus forcing any bits in this mask that 
>-    the user may have modified to be on. Essentially, one bits in this 
>+    the user may have modified to be on.
>+    Make sure not to mix up this parameter with
>+    <parameter moreinfo="none">security mask</parameter>, 
>+    which works similar like this one but uses logical AND instead of OR.
>+    Essentially, one bits in this 
>     mask may be treated as a set of bits that, when modifying security 
>     on a file, the user has always set to be 'on'.</para>
> 
>Index: smbdotconf/security/createmask.xml
>===================================================================
>--- smbdotconf/security/createmask.xml	(Revision 773)
>+++ smbdotconf/security/createmask.xml	(Arbeitskopie)
>@@ -20,8 +20,8 @@
>     from this parameter with the value of the <smbconfoption name="force create mode"/>
>     parameter which is set to 000 by default.</para>
> 
>-    <para>This parameter does not affect directory modes. See the 
>-    parameter <smbconfoption name="directory mode"/> for details.</para>
>+    <para>This parameter does not affect directory masks. See the 
>+    parameter <smbconfoption name="directory mask"/> for details.</para>
> 
>     <para>Note that this parameter does not apply to permissions
>     set by Windows NT/2000 ACL editors. If the administrator wishes to enforce

Actions: View

Attachments on bug 2858: 1299