From patchwork Thu Dec 18 11:36:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Peon Costa X-Patchwork-Id: 126776 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 7393A4BA2E07 for ; Thu, 18 Dec 2025 11:39:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7393A4BA2E07 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=FqE7fxKZ X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by sourceware.org (Postfix) with ESMTPS id D41BF4BA2E28 for ; Thu, 18 Dec 2025 11:36:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D41BF4BA2E28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D41BF4BA2E28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1766057820; cv=none; b=JYa14bWIKD7ZoEQAHgfWxak1x2r1PeoI7tJMu+g2SYhaJYhyF3ZS80CX3Bf3kl64Ox4hoIMZTwYmhZ2s3taBLBKbNSB7/MQ5toeUl6ZMH0JJTQyXPJAGbjOqqKEW68RFMHY6WAKm7rqWiA9zzqkkt9ecIOfDUJnh8R5nUMMM2N4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1766057820; c=relaxed/simple; bh=4+R+H9H9LzS/Swge46A9Ubmcxjyu+DU5GdUjdLAljcw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=wfWb0PzSu4hPfwZkf+qZiCFyWMY2x7czvcaWSM8syjQl9kB2GDNt9xFgyxiS01MHoemgRbPClKZiizJOVSPbuQAhe/EjwIDPYcvgu1C0nfXlBxc/IQqPcT+aaVVyKBoxNdjNcPIwYWOFVIrnrYOx/+1PmKs+V16rFcUFrAW8nkM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D41BF4BA2E28 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4779cc419b2so3636065e9.3 for ; Thu, 18 Dec 2025 03:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766057818; x=1766662618; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kvCkA9QGX2mp4fqzKs+gc56s6g0fapIi21wNoUDfAFE=; b=FqE7fxKZXD/nJx/0DKB38kXOjEOAN/F5G82qXg+Ux0RKfmUG3n9pzKAdSuWsu2gN1O po4UjLBb0E1QIfq/myMt/RxQgJ+g65ADZh5pYMoeAR81wtp30ppe+hhlVqJ0EuEjgYEA LJkz2xLwWcFkriNu+qLk8U9VfSI3e4c0YTj76GotJmRZc6n/+4ZhNOHU+w3gW/6BQ+6g WnkZffxXbLWcskGrzbR8LSkE13tOtWe2Bq4v+9DNRgMFwp8sw1eZcbBDawQ8k1MRWtaK uGNIFn6yU0q49iYqrgHSkkZFwlyWQL8vBTEaEKvo7eVGcRrDImfFLIlzNtBJhWdOGUJ+ B5nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766057818; x=1766662618; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kvCkA9QGX2mp4fqzKs+gc56s6g0fapIi21wNoUDfAFE=; b=hZKTdS+gV3ygaFSAUsf77k5zUI7LOKevUPVw2LwzgHLf2vFGbFYCOjg8t7WrCcozXm L1yFTXb+UAJeeqCSCeuyb2dtLYSBBVZ70YKbi+gbrjeExA+rycVkS/Kyl29PegWBCs0w YXrpIMNSxy/2xlHjSapYaErcqeJlRnMyi9ErI484cYBV7ESxDTCO60vsM1sv6BJNxdMR /jXRtpbQM4YGCMAaFFmsQNG7SvfqasxOomtYmxV3MRiEK6GLooA0TonUQAzZ/7ukwL4a 07DvVTTp3o1ci0CRHQNI64He1b4zqQfp/h2GrsVbPMOKmE/mPKfjZr7sIJIMSR3zoIj1 XD+Q== X-Gm-Message-State: AOJu0YwSYZyY8/m0r+hmu0sH/bqmXl1lZE9IXrq3jbbKzgtuNp4+nmJY j4vq0lLIrwWujiVJDVxzE/7bj9p1GXXqeLlH5CGqfJa6KgSvBTzcxvKMPQv+8w== X-Gm-Gg: AY/fxX6sUcir2FanJPUHEqaVIZwNsHxQ1HeIBJZn5dnI1zZI3vYyWXycJEf0D/modjw 0msuRnYTrXQjWySERTSmUg1jZIMQ8V7CORe9ggKaJ+pb1dkdjbJeJKwgmxwjRne6+dwaFi2oJXd VJ3LNjGcbKwGNH9l0bh9k0YytSEYdLDLSiG5AV0U+zQi30n34TJhpLMx2S/9oUHvIGDX06UKDGP 7A14mydhTEiRIXfYmc33Twr54S6HDa2susnmc1eSffFP09W/EhPG8IbXy6ISjntdBqNDMASFJZk HyrEQ5LVlC+zHVs+dEA93gM5Fzz3wTB4K32pPuykDzUTVVwXZtjueXqPLWJIk5P40NSVLz45NFV uTVycxUoNLQBI/2n2xcGYiUOmUI6gIoOxyWZfzYabw5OqhdLH9gU+ZGc9lwYdHuFV4cY5bpkJrT hvoj0GEwBg1iwAFd31ryh5Afr8gJGhKVlvzF6HU7i6tQ== X-Google-Smtp-Source: AGHT+IGKNg9LK/cEeXJz2WRey7NVSBUu2H3Zi17glljrQIXNFVlVIRG2sQuM0RJQACzne9Cocpb6Hw== X-Received: by 2002:a05:600c:818f:b0:477:8a2a:1244 with SMTP id 5b1f17b1804b1-47a8f8bd357mr187376585e9.11.1766057818313; Thu, 18 Dec 2025 03:36:58 -0800 (PST) Received: from axltcarlospec.central.inditex.grp ([165.85.237.104]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be27b28a7sm38192805e9.12.2025.12.18.03.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 03:36:57 -0800 (PST) From: =?utf-8?q?Carlos_Pe=C3=B3n_Costa?= To: libc-alpha@sourceware.org Cc: =?utf-8?q?Carlos_Pe=C3=B3n_Costa?= Subject: [PATCH] resolv: Avoid duplicate query if search list contains '.' (option 2) Date: Thu, 18 Dec 2025 12:36:54 +0100 Message-ID: <20251218113654.159774-1-carlospeon@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This is option 2. --- resolv/res_query.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/resolv/res_query.c b/resolv/res_query.c index 039c25a3c3..30ace9d06d 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -354,7 +354,7 @@ __res_context_search (struct resolv_context *ctx, char tmp[NS_MAXDNAME]; u_int dots; int trailing_dot, ret, saved_herrno; - int got_nodata = 0, got_servfail = 0, root_on_list = 0; + int got_nodata = 0, got_servfail = 0; int tried_as_is = 0; int searched = 0; @@ -433,8 +433,11 @@ __res_context_search (struct resolv_context *ctx, domain. */ if (dname[0] == '.') dname++; - if (dname[0] == '\0') - root_on_list++; + if (dname[0] == '\0') { + if (tried_as_is) + continue; + tried_as_is++; + } ret = __res_context_querydomain (ctx, name, dname, class, type, @@ -506,7 +509,7 @@ __res_context_search (struct resolv_context *ctx, * unless RES_NOTLDQUERY is set and there were no dots. */ if ((dots || !searched || (statp->options & RES_NOTLDQUERY) == 0) - && !(tried_as_is || root_on_list)) { + && !tried_as_is) { ret = __res_context_querydomain (ctx, name, NULL, class, type, answer, anslen, answerp, answerp2, nanswerp2,