[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2269-gb739c7f

[Michael Adam]

Hi Jeremy,

thanks for attacking this untangling of posix acl code and
general access code! I had a TODO for this but didn't get
started with it yet... :-)

Cheers - Michael

Jeremy Allison wrote:
> The branch, v3-3-test has been updated
>        via  b739c7f1cdb2b19a380b06681b00dcf490d788a9 (commit)
>       from  ac1eac9b0d07b7b3d341c06ef1a8fd8f3c05a618 (commit)
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
> 
> 
> - Log -----------------------------------------------------------------
> commit b739c7f1cdb2b19a380b06681b00dcf490d788a9
> Author: Jeremy Allison <jra at samba.org>
> Date:   Fri May 2 12:54:53 2008 -0700
> 
>     Rename inherit_access_acl() -> inherit_access_posix_acl() to make use clear.
>     Jeremy.
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source/smbd/open.c       |    4 ++--
>  source/smbd/posix_acls.c |    8 ++++----
>  source/smbd/trans2.c     |    2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source/smbd/open.c b/source/smbd/open.c
> index 0d1dd31..dd518b9 100644
> --- a/source/smbd/open.c
> +++ b/source/smbd/open.c
> @@ -323,7 +323,7 @@ static NTSTATUS open_file(files_struct *fsp,
>  
>  			/* Inherit the ACL if required */
>  			if (lp_inherit_perms(SNUM(conn))) {
> -				inherit_access_acl(conn, parent_dir, path,
> +				inherit_access_posix_acl(conn, parent_dir, path,
>  						   unx_mode);
>  			}
>  
> @@ -2058,7 +2058,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
>  	}
>  
>  	if (lp_inherit_perms(SNUM(conn))) {
> -		inherit_access_acl(conn, parent_dir, name, mode);
> +		inherit_access_posix_acl(conn, parent_dir, name, mode);
>  	}
>  
>  	if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS)) {
> diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
> index 61ee5b4..732199e 100644
> --- a/source/smbd/posix_acls.c
> +++ b/source/smbd/posix_acls.c
> @@ -3783,7 +3783,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo
>   resulting ACL on TO.  Note that name is in UNIX character set.
>  ****************************************************************************/
>  
> -static int copy_access_acl(connection_struct *conn, const char *from, const char *to, mode_t mode)
> +static int copy_access_posix_acl(connection_struct *conn, const char *from, const char *to, mode_t mode)
>  {
>  	SMB_ACL_T posix_acl = NULL;
>  	int ret = -1;
> @@ -3810,7 +3810,7 @@ static int copy_access_acl(connection_struct *conn, const char *from, const char
>  
>  int chmod_acl(connection_struct *conn, const char *name, mode_t mode)
>  {
> -	return copy_access_acl(conn, name, name, mode);
> +	return copy_access_posix_acl(conn, name, name, mode);
>  }
>  
>  /****************************************************************************
> @@ -3838,13 +3838,13 @@ static bool directory_has_default_posix_acl(connection_struct *conn, const char
>   inherit this Access ACL to file name.
>  ****************************************************************************/
>  
> -int inherit_access_acl(connection_struct *conn, const char *inherit_from_dir,
> +int inherit_access_posix_acl(connection_struct *conn, const char *inherit_from_dir,
>  		       const char *name, mode_t mode)
>  {
>  	if (directory_has_default_posix_acl(conn, inherit_from_dir))
>  		return 0;
>  
> -	return copy_access_acl(conn, inherit_from_dir, name, mode);
> +	return copy_access_posix_acl(conn, inherit_from_dir, name, mode);
>  }
>  
>  /****************************************************************************
> diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
> index 41f2a15..e7157d0 100644
> --- a/source/smbd/trans2.c
> +++ b/source/smbd/trans2.c
> @@ -5868,7 +5868,7 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
>   	 */
>  
>  	if (lp_inherit_perms(SNUM(conn))) {
> -		inherit_access_acl(
> +		inherit_access_posix_acl(
>  			conn, parent_dirname(fname),
>  			fname, unixmode);
>  	}
> 
> 
> -- 
> Samba Shared Repository

-- 

i.A. Michael Adam

-- 
Michael Adam <ma at sernet.de>
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.SerNet.DE, mailto: Info @ SerNet.DE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 206 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20080505/bfdc8491/attachment.bin