]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:libnet: Fix dead code in libnet_join.c
authorPavel Filipenský <pfilipen@redhat.com>
Fri, 7 Jan 2022 13:11:53 +0000 (14:11 +0100)
committerJeremy Allison <jra@samba.org>
Mon, 10 Jan 2022 23:31:33 +0000 (23:31 +0000)
Found by covscan.

Pair-programmed-with: Andreas Schneider <asn@samba.org>

Signed-off-by: Pavel Filipenský <pfilipen@redhat.com>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libnet/libnet_join.c

index 02705f1c70c1f3db122af10e6c5a72db9ea4ba08..00d71b97f2a273427055d924f1c4eeaddd845559 100644 (file)
@@ -2669,7 +2669,6 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
        ADS_STATUS ads_status;
 #endif /* HAVE_ADS */
        const char *pre_connect_realm = NULL;
-       const char *numeric_dcip = NULL;
        const char *sitename = NULL;
        struct netr_DsRGetDCNameInfo *info;
        const char *dc;
@@ -2731,7 +2730,6 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
                return WERR_NERR_DCNOTFOUND;
        }
 
-       numeric_dcip = info->dc_address + 2;
        sitename = info->dc_site_name;
        /* info goes out of scope but the memory stays
           allocated on the talloc context */
@@ -2741,8 +2739,9 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
 
        if (pre_connect_realm != NULL) {
                struct sockaddr_storage ss = {0};
+               const char *numeric_dcip = info->dc_address + 2;
 
-               if (numeric_dcip != NULL) {
+               if (numeric_dcip[0] == '\0') {
                        if (!interpret_string_addr(&ss, numeric_dcip,
                                                   AI_NUMERICHOST)) {
                                DBG_ERR(