]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3/libsmb: Cleanup, don't modify out params except on success
authorNoel Power <noel.power@suse.com>
Fri, 4 Sep 2020 02:11:08 +0000 (19:11 -0700)
committerNoel Power <npower@samba.org>
Mon, 7 Sep 2020 13:23:42 +0000 (13:23 +0000)
All callers don't use out params on failure.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libsmb/dsgetdcname.c

index 1f0ff66ac4978670e5bc1708a41aa7db86d8d824..81d5f19afa20d756d754014708deb1fbf3c45022 100644 (file)
@@ -449,9 +449,6 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
        size_t count;
        static const char *resolve_order[] = { "lmhosts", "wins", "bcast", NULL };
 
-       *returned_dclist = NULL;
-       *returned_count = 0;
-
        if (flags & DS_PDC_REQUIRED) {
                name_type = NBT_NAME_PDC;
        }
@@ -497,18 +494,17 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
 
        }
 
-       *returned_dclist = dclist;
-       *returned_count = count;
        TALLOC_FREE(iplist);
 
        /* Paranoia in casting size_t -> int. */
-       if (*returned_count < 0) {
+       if ((int)count < 0) {
                TALLOC_FREE(dclist);
-               *returned_dclist = NULL;
-               *returned_count = 0;
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       *returned_dclist = dclist;
+       *returned_count = count;
+
        return NT_STATUS_OK;
 }