From nobody Wed May 15 10:04:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfTN16mlZz5KcJv; Wed, 15 May 2024 10:04:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfTN14VDfz4j1C; Wed, 15 May 2024 10:04:17 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715767457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EcQ1IZU2ervTKBcJKVueFUurrerm8tCwkRx/FCkRWMw=; b=B+IfKCsO9APlzZ+pGrNv4h8iMPUk1uHL+v3U6ONV8wzX40ZVnRH99dirLZ4GRhy8KeiQ6n vCF3lL8rw0dWe34uQFjG8dlvCrYpeFs6YaACLlH1lW65EZmgIoDHRRr3+XJOnww7mM2MhK D4ynLSb8N4mPbSW0sLyBum7rJW9u3FoJDm4jM47BlkF0zxSRzTAaJJvYB+0jOJ4i6ajskr Vfu6S89ABK+6V5lLn7LD8EISEL9u3p1k8X+tGCnJiZjC3IZo0+di6Sky6gCaDF2ZMHnUDT 2h/oOccMYF259bybjrbJ6zbKZXVFYnqopfRxwqLqVIduUkuRFazNzuSOosOUtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715767457; a=rsa-sha256; cv=none; b=Q8YhOwmXWfAw7R5oL6cObJ/3gugE9+myfVjeakGJy3+kT/ky+CtM6n3B9yYby95hlVBic2 FzBDJYXvcBn0f9YCTHEG9jh/K7eoKyMUkH+hFqsF07qd8Hn8xmYC2Wgk2QGOO1+YcIxUfZ PUyx0f2dUzHAjxkqt42OyHNzgEnEf7hphtZK8YqS7uwS2YVr6kmadZxh8bCkj2bHP6n3DU gX8K3uojewsGCFPgkRvx9piU9tGJ9AHNvthKbRR1n3arp/HspMZSAQG8+zeV88nKxyNUAH /j+EmWuuGDn7fD18jrDMqlWaqgmFWb6mqq1/gjxtf8zFye4g2nCZROEe3FZMYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715767457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EcQ1IZU2ervTKBcJKVueFUurrerm8tCwkRx/FCkRWMw=; b=QpnplALFY9P+trBWRcd+dSrWGJ6h4MyoRYuHtANU2r+3RWxGNs6HwKk4sPHEo5fw66DUqy sonjzQLUaiJWXTv91GUSIX4qwdK279YMJEpz6nAigpI36+cLdQW7QgeDYe2MNDQ8ZTlhK1 6U1HJVAqX30/uArWHSTzbCnTVLq+5ydPXM0Ptxbt1B8ba7grUFRjykuLFPZs1x5U85rQ5u Rzr4Y4OtsLU0o4C66cjko+WpbDAYDRiMndPE74B5wsbqLeyRFXJfeR/e/gdew6NUT/csLv T08jt/6Xxu1KZ9AXS/bm9H1wyTSON7VAxBhkZou4sUI19lrAyvXucS7lYgvvsw== Received: from ltc.des.dev (163.23.65.37.rev.sfr.net [37.65.23.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VfTN13P3kz1PJ2; Wed, 15 May 2024 10:04:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 6DBF015254; Wed, 15 May 2024 12:04:16 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: src-committers@FreeBSD.org Cc: dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b5fb1f44ed43 - main - Issue #237 : Resolver uses nameserver commented out in /etc/resolv.conf In-Reply-To: <202405150953.44F9rvSw043707@gitrepo.freebsd.org> ("Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav=22's?= message of "Wed, 15 May 2024 09:53:57 GMT") References: <202405150953.44F9rvSw043707@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 15 May 2024 12:04:16 +0200 Message-ID: <865xvfz90f.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dag-Erling Sm=C3=B8rgrav writes: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Db5fb1f44ed435fa25fe3de87c9= b9ee6c0aad5125 > > commit b5fb1f44ed435fa25fe3de87c9b9ee6c0aad5125 > Author: Willem Toorop > AuthorDate: 2024-05-07 12:43:16 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2024-05-15 09:52:49 +0000 > > Issue #237 : Resolver uses nameserver commented out in /etc/resolv.co= nf >=20=20=20=20=20 > This /etc/resolv.conf: > # x >=20=20=20=20=20 > # nameserver 8.8.8.8 >=20=20=20=20=20 > Still configured 8.8.8.8 as nameserver, because the comment detection= in `ldns_resolver_new_frm_fp_l()` didn't anticipate empty lines before the= comment. > This fix removed all comment handling from `ldns_resolver_new_frm_fp_= l()`. Instead a new function is introduced `ldns_fget_token_l_resolv_conf()= ` that skips comments that start with '#' and ';'. The old `ldns_fget_token= _l()` (that is used for zonefiles too) still accepts only ';' for comments. > --- > contrib/ldns/parse.c | 35 +++++++++++++++++++++++++++---- > contrib/ldns/resolver.c | 55 ++++++++++---------------------------------= ------ > 2 files changed, 42 insertions(+), 48 deletions(-) I actually did this as a subtree merge: % git subtree merge --prefix=3Dcontrib/ldns vendor/ldns Merge made by the 'ort' strategy. contrib/ldns/parse.c | 35 +++++++++++++++++++++++++++---- contrib/ldns/resolver.c | 55 ++++++++++-----------------------------------= ---- 2 files changed, 42 insertions(+), 48 deletions(-) % git show % git commit --amend [main 2dbd65dc861c] ldns: Ignore commented-out lines in resolv.conf. Date: Wed May 15 11:50:11 2024 +0200 % git commit --amend=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20 [main bee1ed74ab26] ldns: Ignore commented-out lines in resolv.conf. Date: Wed May 15 11:50:11 2024 +0200 However, I had to rebase before pushing and that appears to have dropped the merge commit, and I didn't notice until after I'd pushed. % git reflog b5fb1f44ed43 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --re= base (finish): returning to refs/heads/main b5fb1f44ed43 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{1}: pull --re= base (pick): Issue #237 : Resolver uses nameserver commented out in /etc/re= solv.conf 61dece6d27fb (github/main) HEAD@{2}: pull --rebase (start): checkout 61dece= 6d27fb2436928ca93d65667b358e05aa7b bee1ed74ab26 HEAD@{3}: commit (amend): ldns: Ignore commented-out lines in = resolv.conf. 2dbd65dc861c HEAD@{4}: commit (amend): ldns: Ignore commented-out lines in = resolv.conf. 74ce793d921d HEAD@{5}: merge 0c57cb21e0c6a8a86fa074baeaeb6a002e2b7734: Merg= e made by the 'ort' strategy. 61dece6d27fb (github/main) HEAD@{6}: pull --rebase: Fast-forward DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org