From 82f53c82ed6ec4818bb1e2220e25e76fee7cb23e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Filipensk=C3=BD?= Date: Fri, 7 Jan 2022 14:11:53 +0100 Subject: [PATCH] s3:libnet: Fix dead code in libnet_join.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Found by covscan. Pair-programmed-with: Andreas Schneider Signed-off-by: Pavel Filipenský Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/libnet/libnet_join.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 02705f1c70c..00d71b97f2a 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -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( -- 2.47.3