[SCM] Samba Shared Repository - branch master updated

[Noel Power]

The branch, master has been updated
       via  21de9077a52 s3: libsmb: Fix bug in get_dc_list() introduced by ip-service cleanup.
      from  b65fbade02f test_vfs_gpfs: Add test for file id generation

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


- Log -----------------------------------------------------------------
commit 21de9077a52d4f0ff6e85710d26e971e2d3866d4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 8 18:19:07 2020 -0700

    s3: libsmb: Fix bug in get_dc_list() introduced by ip-service cleanup.
    
    Do an early return on error. On success assign to the correct
    variables that are going to get copied into the 'out' parameters.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Noel Power <npower at samba.org>
    
    Autobuild-User(master): Noel Power <npower at samba.org>
    Autobuild-Date(master): Wed Sep  9 10:31:17 UTC 2020 on sn-devel-184

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

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 0bcbb815a64..16b554b4430 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -3960,11 +3960,11 @@ static NTSTATUS get_dc_list(TALLOC_CTX *ctx,
 						&dc_iplist,
 						&dc_count,
 						resolve_order);
-		if (NT_STATUS_IS_OK(status)) {
-			*ip_list = talloc_move(ctx, &dc_iplist);
-			*ret_count = dc_count;
+		if (!NT_STATUS_IS_OK(status)) {
+			goto out;
 		}
-		TALLOC_FREE(dc_iplist);
+		return_iplist = talloc_move(ctx, &dc_iplist);
+		local_count = dc_count;
 		goto out;
 	}
 


-- 
Samba Shared Repository