[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1942-g4f12511

[Alexander Bokovoy]

Jeremy,

you're right here, thanks! The difference doesn't change anything in our
case as dosmode will be calculated once anyway before we get it as an
argument to file_set_dosmode() so &= compound assignment will not differ
for that from its corresponding expanded form but it is better to be
explicit here.

Tridge,

could you please commit this patch to v3-0-ctdb? (attached)

Jeremy Allison пишет:
> The branch, v3-2-test has been updated
>        via  4f125110cfe25b499eb628b5b08fdb610a5d972c (commit)
>       from  8dfc389ff678967a7b16ff1d68f00468a9925275 (commit)
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
> 
> 
> - Log -----------------------------------------------------------------
> commit 4f125110cfe25b499eb628b5b08fdb610a5d972c
> Author: Jeremy Allison <jra at samba.org>
> Date:   Wed Feb 6 10:31:22 2008 -0800
> 
>     Make operator precedence very clear.
>     Jeremy.
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source/smbd/dosmode.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c
> index f068f1f..a2e617c 100644
> --- a/source/smbd/dosmode.c
> +++ b/source/smbd/dosmode.c
> @@ -422,7 +422,7 @@ int file_set_dosmode(connection_struct *conn, const char *fname,
>  	uint32_t old_mode;
>  
>  	/* We only allow READONLY|HIDDEN|SYSTEM|DIRECTORY|ARCHIVE here. */
> -	dosmode &= SAMBA_ATTRIBUTES_MASK | FILE_ATTRIBUTE_OFFLINE;
> +	dosmode &= (SAMBA_ATTRIBUTES_MASK | FILE_ATTRIBUTE_OFFLINE);
>  
>  	DEBUG(10,("file_set_dosmode: setting dos mode 0x%x on file %s\n", dosmode, fname));
>  
> 
> 



-- 
/ Alexander Bokovoy
Samba Team                      http://www.samba.org/
ALT Linux Team                  http://www.altlinux.org/
Midgard Project Ry              http://www.midgard-project.org/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dosmode-parenthesis.patch
Type: text/x-patch
Size: 575 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20080207/2eea4801/dosmode-parenthesis.bin