From nobody Wed Nov 26 15:35:16 2025 X-Original-To: dev-commits-src-all@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 4dGkCS5tz3z6JDHl for ; Wed, 26 Nov 2025 15:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dGkCS2gSDz3QDM for ; Wed, 26 Nov 2025 15:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764171316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3kdVt5bgzhfAQwTOn+xHHBHCkEhv5Hg19qPSEazz5k=; b=tw9CM21oW3DYJOQFWdMnjGUohmsoSwWj+akTs1iGfr+Eze4Czz0XGo/MluyLrK7GYGOejO i0qV+9kdl55UASLv9ihVmevZHBdnRLOMZzP9Mi38fKHsnFj2C0KiGC1coTmhKYs/ESjRX+ +3hsrc8deAAi74XGti4yhqWPw920IzL4GG69abcoUNceLHgSsyAzD/i/RQxHthFSa5KRyb i7dzuLmlyIx578dq4Vm5tXocYbEZZ3eO6CKtAJAMUZ3VVH53ZvGCSklybko60SnA1AmlKD dXG9FaxsS2NFyKEvjBl9Twxi1AmTMdVXHytPAriUdVWrfYvGfOuQRhfBH5ZkqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764171316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3kdVt5bgzhfAQwTOn+xHHBHCkEhv5Hg19qPSEazz5k=; b=aMT3bTocizUa/GF/gW4VcUaSNol4t4Ba0/JIMnTqwAsa5J3zGnHMqvyhmJSkvemSy0O0up ZXGQoLwyzMOJ+V/2rzHjomdYUAWvYz7xYxtFNrThQ290pJrVB5H1T8cHYVfz+ao58Wx4mR QVQbQqE06937eJFxnRIZoGf+lpa/sSfkFXXzelji10gUR9Bgx+nNVYK21viEN0CsifPcGm YLqs4aiDwHG0PFjHo+s7iZWrvl+uiRgFl5yDRrKzk0zpIvVdcEDMIskIcdYltXNjCxoiCf 71YE16hj6R3LPIPafx2ilJ7xzdwouCUNTX5RpspqjxXrZfYPq6n3vT/YcLThQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764171316; a=rsa-sha256; cv=none; b=MpyzsYNmOgBlv9oY6cVGa6S2t4nekPH3gyMQwmhu3bnT9AVwJpo9FhFG+0cMUSOIF1BHi7 Wb4qaFc/4k2N0a0PjfLf69xboLMJwQNDk4DHeiLhiiqhKANJqwyHKfSHR0a7gFpknOdHg6 36a/gxiLquVdgAfe6nWlrNjXFNNFuM3M0GNVzdGhxYWCfDSSUEsGEcIRVz2g7j4Wue9UGF dnl4oE2v2WvxEcBVeptg3fjT01w2H7vuGOYV8OpFPPaoIrDx2OZvRKLtd3TVrpZSkoCUsS vabWHeL8WGcJ7UQxnWhqzRLLcRQrBKycvUvlTEywsvgmIFAsmPDkzg8q2vgiuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dGkCS1rxszslv for ; Wed, 26 Nov 2025 15:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 313ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 15:35:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 5f2dd3dfd72d - stable/15 - local-unbound: Read a tab separated resolv.conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5f2dd3dfd72da7b49d1f9a7f889437480aa6f19e Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 15:35:16 +0000 Message-Id: <69271e34.313ef.24dc7042@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2dd3dfd72da7b49d1f9a7f889437480aa6f19e commit 5f2dd3dfd72da7b49d1f9a7f889437480aa6f19e Author: Jose Luis Duran AuthorDate: 2025-11-19 01:09:58 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-26 15:33:29 +0000 local-unbound: Read a tab separated resolv.conf Use [[:space:]] rather than a white space character to delimit the keys and the values in the resolv.conf file. PR: 236079 Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53811 (cherry picked from commit 0628400590e025b7db1c0905e6ee488a24ef3f60) --- usr.sbin/unbound/setup/local-unbound-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh index 25cfef48b6f0..ec3aeb673ecc 100755 --- a/usr.sbin/unbound/setup/local-unbound-setup.sh +++ b/usr.sbin/unbound/setup/local-unbound-setup.sh @@ -118,8 +118,8 @@ set_chrootdir() { get_nameservers() { while read line ; do local bareline=${line%%\#*} - local key=${bareline%% *} - local value=${bareline#* } + local key=${bareline%%[[:space:]]*} + local value=${bareline#*[[:space:]]} case ${key} in nameserver) case ${value} in @@ -145,8 +145,8 @@ gen_resolv_conf() { local edns0=no while read line ; do local bareline=${line%%\#*} - local key=${bareline%% *} - local value=${bareline#* } + local key=${bareline%%[[:space:]]*} + local value=${bareline#*[[:space:]]} case ${key} in nameserver) case ${value} in