[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  12153af s3: dfs: Fix a crash when the dfs targets are disabled.
      from  b0f41c0 build: use as-needed linker flag also on OpenBSD

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 12153af85d34e4ced5eab76753f2e4cafba0156c
Author: Har Gagan Sahai <SHarGagan at novell.com>
Date:   Thu Sep 10 16:04:27 2015 +0530

    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 at novell.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ira Cooper <ira at wakeful.net>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Sep 11 06:39:19 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/clidfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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;
 	}
 


-- 
Samba Shared Repository