From nobody Sun Nov 13 19:50:23 2022 X-Original-To: dev-commits-src-branches@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 4N9NMh01C2z4ffhj; Sun, 13 Nov 2022 19:50:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N9NMg6cSMz4F6f; Sun, 13 Nov 2022 19:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668369023; 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=n7UtGtWXGzbarqq3eReXcRjhpnOe4f8Y4iF9Rru3rYM=; b=vdBMI9MQ00+tAUs1dkzHP5JaMmFO2v4Gk5azUasyQSBL2mNaNijOOP/9u0ms204KMO1Hat E+Vw2KioIJpmOszSADBt4l4oAMyS7sd9kHEmeEWxhtpAxEQ/SyOAxXYym2QjezcCnH4m7/ CADGxg/ZdXAlpmif9NvN4vydtALvEsNBn9e9oQ/41IeIEAIQmSrJxizgFR7tgLrKzpB+D/ pRTbjpWiqgskTPH5iwGl4Ra40KcVk8Q6s14qk3EUcSHLuOu8dp4DXxSMyT5MbfTwHjqBlI jgaBamCPP/EzJa2laEQgar0po5thItZfPP730Ro9TkYByzCTxEH/7kbCyCjs/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668369023; 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=n7UtGtWXGzbarqq3eReXcRjhpnOe4f8Y4iF9Rru3rYM=; b=u0BMlF4MQtP/PYgoZFH6LHe4o7aRxQSAAt/QJGPRy4FJtkqO+FSxmUeq6DTa1XRJVy0v9s DaRIJbAb463nI7I3rAksjT5s6FoyErUOwZJ0hla9E+gJAT8IDWetbGKuXXwTHEoaaeVZud eIUutP7jerEgZaUj5gkHuVb98XthCQtL1HqsMKh3VGhhoobBuXKzUrMhCqCAO724NMCsiD cnzbLOXvu7a88jpFVcpFyZV3LwL1lJgAac1aYzOznC4UjJJsNlwLuNp1zrVVkZRRSir0wz hufmElpHw2xJ7ZlCqsDGnfo95+0ZZzP8wpBTudFS44G0rDNxb5dSb1dXI54dXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668369023; a=rsa-sha256; cv=none; b=FaZAKb8w6+YE9+Lvu8lJO1fKNZJHMwOYfhro+ro/OB0UTzdQC2g5OOGYlgoKXOAQffHxbM HByHaLF+SViG6QoR/xEm8Xxr4+LA7NQT85LxStbMlEqFFHghSoE1fTTbmLs3DYUtVF+uLd RUiRZnAXBGynemCCG8QyntojujcjNn8ZUmQYDCqzciNEINW7dTzslCy5pBnhbUom3NR9yU bxtr7x8bLvqhq1b7JY9+gqf/on6tNTAp8LGmEAiby4/URVxa1xcJUMrovi7us7nQ3Ne9Hm FpyUkWArCYkT7PrkNyU6l3AfSoGg37xVt0CU3bWPVbrETVGrLzyQP+jwXWrQOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N9NMg5gVkzFH0; Sun, 13 Nov 2022 19:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ADJoN1b013501; Sun, 13 Nov 2022 19:50:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ADJoNvW013500; Sun, 13 Nov 2022 19:50:23 GMT (envelope-from git) Date: Sun, 13 Nov 2022 19:50:23 GMT Message-Id: <202211131950.2ADJoNvW013500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 134b047d3e93 - stable/13 - logger: fix builds without casper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 134b047d3e931271a2f2493af1aabadbeac0678d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=134b047d3e931271a2f2493af1aabadbeac0678d commit 134b047d3e931271a2f2493af1aabadbeac0678d Author: Mariusz Zaborski AuthorDate: 2022-10-19 14:00:07 +0000 Commit: Mariusz Zaborski CommitDate: 2022-11-13 19:49:43 +0000 logger: fix builds without casper We can enter capability mode only when Casper is available in the system. Reported by: mjg@ (cherry picked from commit af3297898720af2f2ed18d18d45ea6bf50d55ef1) --- usr.bin/logger/logger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c index 44aa8ed3bae1..1ce8d81db6f6 100644 --- a/usr.bin/logger/logger.c +++ b/usr.bin/logger/logger.c @@ -182,7 +182,7 @@ main(int argc, char *argv[]) caph_cache_catpages(); caph_cache_tzdata(); if (nsock == 0) { - if (caph_enter() < 0) + if (caph_enter_casper() < 0) err(1, "Unable to enter capability mode"); } capsyslog = cap_service_open(capcas, "system.syslog");