[PATCH] swapped arguments in vfs_expand_msdfs

[Jeremy Allison]

On Tue, Mar 14, 2017 at 04:17:54PM +0100, Andreas Schneider via samba-technical wrote:
> This is a fix for bug:
> 
> 	https://bugzilla.samba.org/show_bug.cgi?id=12687
> 
> Review and push much appreciated.

Obviously correct - RB+ and pushed. Thanks !

Jeremy.

> 
> 
> 	Andreas
> 
> -- 
> Andreas Schneider                   GPG-ID: CC014E3D
> Samba Team                             asn at samba.org
> www.samba.org

> From 61a60b09aaa55f0df8dd0b9ce88f576017a6b624 Mon Sep 17 00:00:00 2001
> From: Andreas Schneider <asn at samba.org>
> Date: Tue, 14 Mar 2017 16:12:20 +0100
> Subject: [PATCH] s3:vfs_expand_msdfs: Do not open the remote address as a file
> 
> The arguments get passed in the wrong order to read_target_host().
> 
> BUG: https://bugzilla.samba.org/show_bug.cgi?id=12687
> 
> Signed-off-by: Andreas Schneider <asn at samba.org>
> ---
>  source3/modules/vfs_expand_msdfs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
> index ffbfa333bad..e42d0098b32 100644
> --- a/source3/modules/vfs_expand_msdfs.c
> +++ b/source3/modules/vfs_expand_msdfs.c
> @@ -147,8 +147,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
>  		return NULL;
>  	}
>  
> -	targethost = read_target_host(
> -		ctx, raddr, mapfilename);
> +	targethost = read_target_host(ctx, mapfilename, raddr);
>  	if (targethost == NULL) {
>  		DEBUG(1, ("Could not expand target host from file %s\n",
>  			  mapfilename));
> -- 
> 2.12.0
> 

> From 61a60b09aaa55f0df8dd0b9ce88f576017a6b624 Mon Sep 17 00:00:00 2001
> From: Andreas Schneider <asn at samba.org>
> Date: Tue, 14 Mar 2017 16:12:20 +0100
> Subject: [PATCH] s3:vfs_expand_msdfs: Do not open the remote address as a file
> 
> The arguments get passed in the wrong order to read_target_host().
> 
> BUG: https://bugzilla.samba.org/show_bug.cgi?id=12687
> 
> Signed-off-by: Andreas Schneider <asn at samba.org>
> ---
>  source3/modules/vfs_expand_msdfs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
> index ffbfa333bad..e42d0098b32 100644
> --- a/source3/modules/vfs_expand_msdfs.c
> +++ b/source3/modules/vfs_expand_msdfs.c
> @@ -147,8 +147,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
>  		return NULL;
>  	}
>  
> -	targethost = read_target_host(
> -		ctx, raddr, mapfilename);
> +	targethost = read_target_host(ctx, mapfilename, raddr);
>  	if (targethost == NULL) {
>  		DEBUG(1, ("Could not expand target host from file %s\n",
>  			  mapfilename));
> -- 
> 2.12.0
>