From nobody Wed Nov 26 15:35:50 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 4dGkD70YLKz6JDQl for ; Wed, 26 Nov 2025 15:35:51 +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 4dGkD65Mrhz3RDp for ; Wed, 26 Nov 2025 15:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764171350; 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=ym1A1eEnWogAO+E6YVlcLyRa8rCvqbtBzbj9QsjLkOg=; b=pYlzdNuqm4jhkLRn980/1oSZmGegCQMIC8OJdRFYRuxTpzHX7uUTOtPY85SORNisH0z4G0 9s+eJzVHgKaiT0ysWYaMIwXwqG7xUP48A7ZHhi8cW0THbjWGAV8+yRxdLZowws52LSUkau /z7D4/6gS540jyvX2+KNU1223cXo/Px8RxN6SomtFCbSYqQao+t/oC36jErnUmKp9RkcQo HyJviYx8hpT6rs70dGplKpoL2OzK1iIr0+1ga92t+AclFnYIkR45b/XZhmX58di87T8skl xRlfPqbXQze9N9Uug+MwjvtQ5RH64Km0nI9U2+yRx17oQp1UHlwttqIoguz0Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764171350; 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=ym1A1eEnWogAO+E6YVlcLyRa8rCvqbtBzbj9QsjLkOg=; b=ZtnUX8bv2Zk+HAA49+XwMvC6LmliqpvkbNRRB0U5kAQOw09vYvfJyS/hgQSWNvxphFxUHe mLxkQnKcgaO8MrbNLyS+/Zpv8Jda0jE0uG25KSbUzR2a/gIXoDwcxO/wD1R2D3dSAY1wcu sK0YUN0ivuKSojzVyf42NvFHAT7V56l1h9oHJk/NALgmZRYSK2CXEOkkL9/Rxp5fHajFtN fzlBlIEsRGdvebWAHDOgT9qvG2sT+JRwNEkqFIdZ3XA6fFUlaQDTI/80vdIl7OV067f7vJ wxJph3KSrPVFPdDuSyY1CkGaIKLwI0jTqJP55//t4Pp0UuEe5yOckkrRoVO3SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764171350; a=rsa-sha256; cv=none; b=vU7skDkn60kkhflK89bkllI4uB2NjDT6S3hUj1xDscS6caHXh/6eg7zqi8Yvr5jkHXqzGn vNMVRCRSHhN/7v3Qg7U8TuCLxD2dXRoDJgNwSTudw/fG7bl0saBfHF0yfdpU6ZuLulcCwP +0EduK0G6naP9mQeDXGWDAZJIyRJdbkhqGpM51u6kgNo2BJL9ZZgwr+KOUkgkY+5BisvOK E6wYQ+9JfovgIhtqHMWs5x4lQEeftZU+3i146+gd7remCjWjpvTCi460MRvNEDFh+U1GOL HVL3ZLO79sxMlKmdI6oUMLm4mWx7W82o64aGbVI5PXFiJuehNS3WuJoS8tFYwA== 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 4dGkD64z6szsm1 for ; Wed, 26 Nov 2025 15:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 15:35:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 111b60a2fddc - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 111b60a2fddca6051c6e782c4a9a4da258ed4cdf Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 15:35:50 +0000 Message-Id: <69271e56.30f4e.1ccf8b3b@gitrepo.freebsd.org> The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=111b60a2fddca6051c6e782c4a9a4da258ed4cdf commit 111b60a2fddca6051c6e782c4a9a4da258ed4cdf Author: Jose Luis Duran AuthorDate: 2025-11-19 01:09:58 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-26 15:34:23 +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 90e255204135..c15ce96e1cfe 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