From nobody Mon Jun 16 02:51:48 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 4bLDzn2RmGz5yMxP; Mon, 16 Jun 2025 02:51:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLDzn09qlz3Rsr; Mon, 16 Jun 2025 02:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042309; 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=hfCZJr1GGO+8VBKNOKXxvAS4vEy862IIxxJok6b726o=; b=KIhAEp4QxTFlbyPkaNMI2ZYEvz/u04q7N/n+JgcNQbIN/0rU296ieU1nNKSHMjwJ7uPVRG b3XEdVSvLhCfcdgRFkzmvU3rdAX6nVI6CPoTsObgnX+fwZbVOfaEyl0Idda7XInxDUHBVy 0CVYZ0blMK0zzPxU09VWBFdUZ90Zofx3PnU94Bs7+1J6xVsQOx6Xolzqz4mYZmi+rWK58B 4ocNxGDwnMp1s+gtHSFdCdo858sqt5wCUboJZGRgw7XkBwHKtTGkgyUOv/afnkN47C642T d8o/U4N4Z67d8yZyDRGIvIoNiLGGI7mWtD8zXhxIcbpYHm5HEcZ97hhlEk5Vaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042309; 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=hfCZJr1GGO+8VBKNOKXxvAS4vEy862IIxxJok6b726o=; b=ocUV74dmdAZoDKaMYBQAehf9NLUzzw6DrqVVkbWcen0ZcGNPoK7d3ggFGnQF6F+XeXRom6 eVNxZDyRS3znaIihmEm+DadJjeZ+ErZ7CzkAU57KvoCIcef6jsC/ZqQ/+/84bGb9CK8uKA V3m1WJ8IwJh94dAZgp2cNKe+Uu3WdTI7J2VbxQTw9slV+K2CUApi4fA1Ahwh4pCohXLDBY /X1DRvPCteMfC2JlA5zkuX+fCOkuXxF8ZMK4MJ9DsrQmO+7g05qanPSxKaZi8saniI2VHJ 3/aWhXRroeoHSJ7yYDH9vhSjptS7JRjj9JpFA5cMIFPHyRcVYVN3FOm+trqPyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042309; a=rsa-sha256; cv=none; b=MCPInPrfxdb3S4d5bYdHuxnNjwSv4HNxhYTGwk7QGhNSaSqyhnyTK4Xl9NhGsSNBdI7dO4 Go2lQAgqVLwzYBOokaRHAEx3fM5/yKEyg/flBR0lTLkYvZzYgq/sVdgKs3q2cUgHibPc6G tm6tbr2x/PbaBRprUpPKeAxOqgqCKIBAaA8bZ+xkjMMsd7rhpFADPXkDVSZwALbG1VouPS Wy+RxJrC1taMES6Rz5IWir2Uk44TshEx23NNlUh4e0pw9IwEz5gmlazRbjqpp5zHvQY2lf T9Q5ZyjXA07K/LkwrJ/ZfsoBvDPBXREr9/7uyDYImiSshRwv4BmeJbK38mk9Mg== 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 4bLDzm6rqTzgkD; Mon, 16 Jun 2025 02:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55G2pmHC062907; Mon, 16 Jun 2025 02:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2pmJ3062904; Mon, 16 Jun 2025 02:51:48 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:48 GMT Message-Id: <202506160251.55G2pmJ3062904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: d903f2e289a7 - main - pam-krb5: Add no_warn dummy option 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d903f2e289a7f8c502918ebc64d46aaa86efce24 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d903f2e289a7f8c502918ebc64d46aaa86efce24 commit d903f2e289a7f8c502918ebc64d46aaa86efce24 Author: Cy Schubert AuthorDate: 2025-06-10 17:46:15 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 pam-krb5: Add no_warn dummy option This is to avoid throwing unknown option errors for pam.d files that should work for the Heimdal pam_krb5 and the MIT friendly pam-krb5. This option will be removed when the pam.d files are cleaned up after the removal of Heimdal. Sponsored by: The FreeBSD Foundation --- contrib/pam-krb5/module/internal.h | 1 + contrib/pam-krb5/module/options.c | 1 + 2 files changed, 2 insertions(+) diff --git a/contrib/pam-krb5/module/internal.h b/contrib/pam-krb5/module/internal.h index f3d832a17248..f3ea30139815 100644 --- a/contrib/pam-krb5/module/internal.h +++ b/contrib/pam-krb5/module/internal.h @@ -109,6 +109,7 @@ struct pam_config { /* The authentication context, which bundles together Kerberos data. */ struct context *ctx; + bool no_warn; /* XXX Dummy argument, remove when Heimdal is removed. */ }; /* Default to a hidden visibility for all internal functions. */ diff --git a/contrib/pam-krb5/module/options.c b/contrib/pam-krb5/module/options.c index f2c3791d895a..799b3a33e168 100644 --- a/contrib/pam-krb5/module/options.c +++ b/contrib/pam-krb5/module/options.c @@ -52,6 +52,7 @@ static const struct option options[] = { { K(no_ccache), false, BOOL (false) }, { K(no_prompt), true, BOOL (false) }, { K(no_update_user), true, BOOL (false) }, + { K(no_warn), true, BOOL (false) }, { K(only_alt_auth), true, BOOL (false) }, { K(pkinit_anchors), true, STRING (NULL) }, { K(pkinit_prompt), true, BOOL (false) },