From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/11206 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Sedich Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH v2] attempts option not being respected in resolv.conf Date: Mon, 3 Apr 2017 17:36:57 -0700 Message-ID: <20170404003657.22843-1-stefan.sedich@gmail.com> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1491266243 32507 195.159.176.226 (4 Apr 2017 00:37:23 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Apr 2017 00:37:23 +0000 (UTC) Cc: Stefan Sedich To: musl@lists.openwall.com Original-X-From: musl-return-11221-gllmg-musl=m.gmane.org@lists.openwall.com Tue Apr 04 02:37:19 2017 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1cvCTD-0007eh-DR for gllmg-musl@m.gmane.org; Tue, 04 Apr 2017 02:37:15 +0200 Original-Received: (qmail 19611 invoked by uid 550); 4 Apr 2017 00:37:19 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 19581 invoked from network); 4 Apr 2017 00:37:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pw4FaOwGErzWUWnbpDNlfaaO+ptbRM9BpA59H2KOqX8=; b=n6PZRwg37sJpfvA+wCGBm2n6dwpmkkIT0V81yrXC+2O63PZucTB490vuXzD6HpXS8e X5FHOc9NSt46obQyzugRMFpxTPeAaEynIIhK+R5tA+kC4RNja1iFf8ywFwWzsVBhUxdP o5dJfTPbj9hrpyT7RrRm1+DVXTSDyQz5taeWq2qVjlaJHkc/Vm8BdgZ5kLpJeGEw9qZk gVOsctF1VQWF5FPchFRAk9RV/X1nzhB+aXrMpHEvUNm/DHeMLJxcWD+kiP1zNj8GTeiX rB2YGFOyQGtIPeBQFxl6aymgPpmnQnqT3Sunn2Nkit0G6Gvf8DBWESSc8kRJTQar9EuE 2jwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pw4FaOwGErzWUWnbpDNlfaaO+ptbRM9BpA59H2KOqX8=; b=oJWi5treSurIV00m8LIRurATUdbYXAyWfkxvLD5cqThoI8DhWVIFnaQYusmzysGLv3 CI9EbP69Mflyfqq1KGTrZMb7xK+FaXhC0gyNtT/AVLAEIOUTpjsWncBlRnFhp8WQmiE1 JcG4igOBwQx5WckuwNhQJiHWhbX3Jvm+mGIy/IkD5vsRN1p7+e3kLJosEeV0Dq6mAzQo nJb4A85zJhTjmm8YCGu9p+6+J9Q9JivKD0kV1JQyCJrZrzSxfFySonRg5DYBUFUBWj5s sU7m2qzEL8qFK/5bY8ecRGEoVHNnSWoIlTvyt4olOtN25QznZr/imgDqgFPjs1ZN93DZ rcmg== X-Gm-Message-State: AFeK/H146OjWl39HZ1HCB4Z2YK0JUZVu9IAJVeUb49vvLMlv5oGWdpr94JKHbfNyiIMThw== X-Received: by 10.84.218.71 with SMTP id f7mr25270887plm.188.1491266225854; Mon, 03 Apr 2017 17:37:05 -0700 (PDT) X-Mailer: git-send-email 2.11.0 Xref: news.gmane.org gmane.linux.lib.musl.general:11206 Archived-At: This fixes an issue were the attempts was not being recpected in resolv.conf, from what I could see it used to work this way but changed some time during the refactor to resolvconf. --- src/network/resolvconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/resolvconf.c b/src/network/resolvconf.c index 2cf1f475..4c3e4c4b 100644 --- a/src/network/resolvconf.c +++ b/src/network/resolvconf.c @@ -45,8 +45,8 @@ int __get_resolv_conf(struct resolvconf *conf, char *search, size_t search_sz) if (z != p) conf->ndots = x > 15 ? 15 : x; } p = strstr(line, "attempts:"); - if (p && isdigit(p[6])) { - p += 6; + if (p && isdigit(p[9])) { + p += 9; unsigned long x = strtoul(p, &z, 10); if (z != p) conf->attempts = x > 10 ? 10 : x; } -- 2.11.0