[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.11_ctdb.61-7-gde78566

[Jeremy Allison]

On Tue, Jul 28, 2009 at 07:26:04AM -0500, Michael Adam wrote:
> The branch, v3-2-ctdb has been updated
>        via  de78566957518ef4327f7fede6337808655d437f (commit)
>       from  754c9a56d1908ccd445c9451e0fc4dab37843edd (commit)
> 
> http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
> 
> 
> - Log -----------------------------------------------------------------
> commit de78566957518ef4327f7fede6337808655d437f
> Author: Volker Lendecke <vl at samba.org>
> Date:   Tue Jun 30 14:26:32 2009 +0200
> 
>     shadow_copy2: The system getrealfilename() can't deal with a 0-length fname
>     
>     This fixes viewing the content of snapshots in the share root directory. We
>     have to treat the filename that *just* consists of "@GMT-YYYY.MM.DD-HH.MM.SS"
>     like the share root, which is the current working directory.
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source/modules/vfs_shadow_copy2.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source/modules/vfs_shadow_copy2.c b/source/modules/vfs_shadow_copy2.c
> index 584336c..a2b1a3f 100644
> --- a/source/modules/vfs_shadow_copy2.c
> +++ b/source/modules/vfs_shadow_copy2.c
> @@ -431,6 +431,10 @@ static char *shadow_copy2_realpath(vfs_handle_struct *handle,
>  	 * as here all paths start with "/", not with "@"
>  	 */
>  	if (shadow_copy2_match_name(fname)) {
> +		if (fname[GMT_NAME_LEN] == '\0') {
> +			return SMB_VFS_NEXT_REALPATH(handle, ".",
> +						     resolved_path);
> +		}
>  		fname += GMT_NAME_LEN+1;
>  	}
>  	return SMB_VFS_NEXT_REALPATH(handle, fname, resolved_path);

Michael, Volker,

	This doesn't look like it's in 3.2, 3.3, 3.4 or master.
Does this code apply (things look very different in those branches).

Just needed to check as this doesn't look like something we want
to lose... :-).

Jeremy.