From nobody Wed Nov 19 01:12:26 2025 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 4dB3P61X7Bz6Gwwc for ; Wed, 19 Nov 2025 01:12:26 +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 4dB3P60jvtz3J2W for ; Wed, 19 Nov 2025 01:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763514746; 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=v+iT1kVbiKSkuBDRLM3cM//WE4zJLGOAwogYYX6/Qj4=; b=nJZWibuVDI930MVPa6SgrvVfeZ79ssCqZ25D07A8FZN5xgzg8VkOoK43Os59hcHOvx7mzD xV/SBu9DVL8Z2U5BPC4oOOUf6k1LA6XQ3mVluw+Xbk+O3OhWoWmp2/I8z9L24QGZj2TpEl emFhnWUmMjmyUBaxa+qep2tGxO3HuCC0hDqLmt+LrNfwc/RZtDOgyKuEqkVHVLyqqky2tV 212Mkbm6x0fFtxgN/i2GQjKu7z5WHpvYWnKmYi4H54lEFZGYdnH5HuCfObkrT+weBKnXg9 uB5OQi61cormskdKdzthWY/AL22zL6+58wy72xU5SrmpPB0XdmIGW4eXUuRcUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763514746; 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=v+iT1kVbiKSkuBDRLM3cM//WE4zJLGOAwogYYX6/Qj4=; b=obbo9jdMXo0NEHNQIL5NsZxflc7dVtscSa4BrSgor87clqLViBZ20IiUWGqXKpT5pAtG+w CiZdWoFMrrRowwn+bgB93b3Olsw/U6vJ4dbReDRWF+dQYW0Q32ckIqCRSgPZCBOL1ufqSA HmQH+5knORY6N7TDZ62qfCG8WeAMXwtCprvTkQQGD/R3g0h0Q4mDq4SfJLKE9hc42jfxAK XB6VUUJ0+P1hUpRl71q8rwcyYUHoasOXssJLfW40uTDjkvwfflEgfU5kR9Q0RsRRsdaSXm wvecrp2KHh7R1NPAzZV7p5cOCiCysxRL/WyoX/WfJpNeOIzwkvUj0zY9neMsQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763514746; a=rsa-sha256; cv=none; b=yk6xGVmo7SxlEx5Vkr87GdUTNoI+e1sqibZZBlV2AAi85t7BrJ+DFnqUEpNgTle867lFmB EIxuiwPxyACRjyFxcapGViwgwPnUlKVB1MUGAUX8a63uA610GoF95UyXbUDTtI+gJoiB8S +gAj3Mj6EiMUxLkWtAhBbHKmHt8LQ9UvmOOpSHX4hbdfx8L79tmiU3ecQdB4ebl7SuffGw 7ie3KTFPlzpGbbnh0Y+kfT7VxlRnVa7E1iTiWjDBHOjSd/IvRK6aBmVocnWn4yQGlPp3q/ TpYsE2RNDSzKqeV05Kx7KpjGc7BTdfK+Mg12RQxJIWHF/8r8epyC0+3JDcd9VQ== 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 4dB3P60GPNz3WC for ; Wed, 19 Nov 2025 01:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25f7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 01:12:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 0628400590e0 - main - local-unbound: Read a tab separated resolv.conf 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: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0628400590e025b7db1c0905e6ee488a24ef3f60 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 01:12:26 +0000 Message-Id: <691d197a.25f7d.72efc9ca@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0628400590e025b7db1c0905e6ee488a24ef3f60 commit 0628400590e025b7db1c0905e6ee488a24ef3f60 Author: Jose Luis Duran AuthorDate: 2025-11-19 01:09:58 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-19 01:09:58 +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 --- 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