Attachment 11431 Details for Bug 11509 – git-am fix for 4.3.x, 4.2.x.

[patch] git-am fix for 4.3.x, 4.2.x.

0001-s3-dfs-Fix-a-crash-when-the-dfs-targets-are-disabled.patch (text/plain), 1.16 KB, created by Jeremy Allison on 2015-09-11 19:22:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-09-11 19:22:00 UTC

Size: 1.16 KB

patch

obsolete

>From 12153af85d34e4ced5eab76753f2e4cafba0156c Mon Sep 17 00:00:00 2001
>From: Har Gagan Sahai <SHarGagan@novell.com>
>Date: Thu, 10 Sep 2015 16:04:27 +0530
>Subject: [PATCH] s3: dfs: Fix a crash when the dfs targets are disabled.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11509
>
>Signed-off-by: Har Gagan Sahai <SHarGagan@novell.com>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ira Cooper <ira@wakeful.net>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Fri Sep 11 06:39:19 CEST 2015 on sn-devel-104
>---
> source3/libsmb/clidfs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
>index bd587bc..2121ad0 100644
>--- a/source3/libsmb/clidfs.c
>+++ b/source3/libsmb/clidfs.c
>@@ -958,11 +958,11 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
> 
> 	status = cli_dfs_get_referral(ctx, cli_ipc, dfs_path, &refs,
> 				      &num_refs, &consumed);
>-	if (!NT_STATUS_IS_OK(status) || !num_refs) {
>+	if (!NT_STATUS_IS_OK(status)) {
> 		return status;
> 	}
> 
>-	if (!refs[0].dfspath) {
>+	if (!num_refs || !refs[0].dfspath) {
> 		return NT_STATUS_NOT_FOUND;
> 	}
> 
>-- 
>2.6.0.rc0.131.gf624c3d
>

Flags:

jra: review? (ira)
slow: review+
obnox: review+

Actions: View

Attachments on bug 11509: 11423 | 11424 | 11431 | 11448