From nobody Wed Nov 26 15:35:32 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 4dGkCn0MZpz6JDT6 for ; Wed, 26 Nov 2025 15:35:33 +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 4dGkCm6ZpBz3QtZ for ; Wed, 26 Nov 2025 15:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764171332; 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=Cv/f7bFR+SBaSlr6xJl16C3cLddrViDZO+2dibKFrio=; b=RW+3QsD/eHwaFzBIySUiRnI1jn6Nl9+mE2yjYk3LwuZKs8PSHoLCJgJFMo1HB/QJQjiwnM VZCG6D5es9jx4TgXF3seM+3IO0/QyklQ3Rvj6vULymvy1xnvKUuBbMmd0uTtgXgbe9s7uW nDcXDQ3O0jeoF8T5q+DJQODy9QSlqaoMyY94xFx1OT3mCUcoV41RlSuSYuPehyPuaq6qVe YFLjtkzVnQWrKkhFi4kPu2qmm2OET3gDnspgbCEp/lZ4pViAHE5FcLumkXVM6MNxJzCKLu zzSJzd0hZEkCHxXidW7/5dqkP97o/UIMbIDehTmVvO/JzKUKpeR+M7APboip/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764171332; 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=Cv/f7bFR+SBaSlr6xJl16C3cLddrViDZO+2dibKFrio=; b=DiGYE8k97NIrAKovOcXULZL4kv1crDRXneBhkDWFac37fV4jAStkIB7d5uiaCI91gZAvIG qRrknPBnF3EV+YENuHZ22+PF/ymM3UvGz8JQXACk1xGM0JbFZeJkXM3hFGjIBLqKSGfQDI fehIKv11wALqZseXyJQhEIyu2U3+PplviB9RWyrcTYQ1gQ00EvuQbFqtiSRGpQ53I5UmgM YiEWlJlvSnxtGdjFIt2UmOvN7INH4+jcJxUnzl383dNcj38YnjN9n4kov7rUH5tw6dzjwC qgToqN7WWxMVJeRSr2/dchL/xOEZILHMZqArA8YmDAlN5Lsh7EIyABpBLv+AMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764171332; a=rsa-sha256; cv=none; b=NRcZK1FbSHj5/bCEgcsUrn9GEKYBUF0iFqEHx04CORQNVOyg3c3OvRSRsPu8KNK0pQ6ajy ZOr2DELBhSD0UQgaUEQTU6FerqLKyG8Mquum+pIkxOcwINqDZoYtZ5MXfrIm0cORAbhlH/ t4GJiArvSJw899PvE+qmMeJ1Uj28wD8o42Ff0LCSbbTKCk8CCqZulq2JsSMLv+Jtm32SKn R+Jb6avGzYUDweboHUOe9Zw5+jMcGLv/68AI5/OJGFjs4iLTHRWfvW0l8fwKMdEWo35U75 0r8Xyn7LALhxEwgHLWJg9rV2EVke2KNTDcI2VehVc383DLhNWhpzu0KwKPtdCQ== 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 4dGkCm5yN0zt05 for ; Wed, 26 Nov 2025 15:35:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 313f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 15:35:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 5a2f81012ab5 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5a2f81012ab56436813a6c86fb578cc3a686f078 Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 15:35:32 +0000 Message-Id: <69271e44.313f3.642e1db8@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=5a2f81012ab56436813a6c86fb578cc3a686f078 commit 5a2f81012ab56436813a6c86fb578cc3a686f078 Author: Jose Luis Duran AuthorDate: 2025-11-19 01:09:58 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-26 15:34:40 +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