From nobody Wed Oct 19 14:02:47 2022 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 4Mssr820Jhz4g2tF; Wed, 19 Oct 2022 14:02:48 +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 4Mssr81QWKz3N3R; Wed, 19 Oct 2022 14:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666188168; 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=Q6EFZL45kjPsNbLr83W7mVfXa02Y/aYqzbgKpNAETGw=; b=jh6na91UZXlioc2QGFim0rL9BtfcFmedXqei30k6QsuZ9vN6rQ7XcRm9HrvLO7sIxPA/su XabhwZ2nW1H2baWaFP3YF/FtZVtCRq6FXlINJc5Xv/oDkyY8wPhV994w6OYO06Q5obWHXc 1vI6PJi1pw11RRTeIbpucSOtHwCBfO5NOWwZ+f6tE+ykouemDxmg9XgmRpl1dvuqlpxQ8i LVmv8xSVBOjw8nF/EBHcPPXXCNQ2a2UZ8qU+3Hk8it89p2gpYETSOU4ocDIYQ0eSaMHsTt GMDvIFTuCnV39rFChO3jC80+5s+hE2Mx0vj34A5mOJC9da18aR40DhVJyh26gw== 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 4Mssr80RwmzYZ4; Wed, 19 Oct 2022 14:02:48 +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 29JE2l9V023014; Wed, 19 Oct 2022 14:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JE2l44023013; Wed, 19 Oct 2022 14:02:47 GMT (envelope-from git) Date: Wed, 19 Oct 2022 14:02:47 GMT Message-Id: <202210191402.29JE2l44023013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: af3297898720 - main - logger: fix builds without casper 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: af3297898720af2f2ed18d18d45ea6bf50d55ef1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666188168; 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=Q6EFZL45kjPsNbLr83W7mVfXa02Y/aYqzbgKpNAETGw=; b=baI+4hUqFhcCNaLP8F0SYVbtz4PmWPMViASB/mblVFpRhIXgcuI+1mGbTSDKq37NLF0fzL WONxmoaY/NZT81kHvazTjKXbxneCz31IQFFsrTVdPP+zXfBNcfYbu7OZWj2wHtZBooD1B6 Ql+lqVdVyQlIl6FTgMEmJa6zLMZ1uaxicsAhGZKb4te/bsItKyfEQAcaDZHXuW/c1Ib+wP o6iaH4O/9o8/Zy96e9r9NoYO/80PRpjKbunCwQXyQjOuNvWdaTZ4dcHu7hQNBItWcR2Ezi W6XmXhawu5lurmv4/Are2aJV8JwKzd0UK3l9AXF44CP5c2oXwJUumRq5HLgoSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666188168; a=rsa-sha256; cv=none; b=QWEKiOC7XNn6lsyDvCMw7EIYQkNNVhc3SZ8qEn9ZMoSjWEDQIJmJQWYKr1AWz1EkT4aU9J D8xIa33nZ3ZhB6GgcjAgRvkjU//SCEAtvf33+hQZFLg0aPlOeJCEQ1J4pZlKhkh5HspnNo xl5AOSqD2LZjWoGOZbVeJr2GdvEq9YCTFHaY9AGBHt0yDm1EHw9qkOJlBcYMAR1BAG4Mto uchqJNyOqPKuuEIT28PoArcScNFIrGpmB+PL0NSH4SFzxYeW2fGD72kvAlTzgn3KuhlE8F z2AjcrfMCnJq4Hg3rjZkL3oI4PSNYZjJ1R7kp5FI4HR6dlwwzbValDeYlSy4yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=af3297898720af2f2ed18d18d45ea6bf50d55ef1 commit af3297898720af2f2ed18d18d45ea6bf50d55ef1 Author: Mariusz Zaborski AuthorDate: 2022-10-19 14:00:07 +0000 Commit: Mariusz Zaborski CommitDate: 2022-10-19 14:02:30 +0000 logger: fix builds without casper We can enter capability mode only when Casper is available in the system. Reported by: mjg@ MFC after: 1 week --- 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");