From nobody Fri Aug 8 13:16:19 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 4bz4Kv72tVz63pKy; Fri, 08 Aug 2025 13:16:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bz4Kv4rPxz3Yyr; Fri, 08 Aug 2025 13:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754658979; 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=jtJbCOK3fQlcNm3yz3zemE36dRCclLnwUSvQNG0D8J4=; b=mKF1XQjI63MeXTe7KIiwlHP3Ao/s7ds5UFHOHQE13EWuYy20PMnK31nCa9565+zUBFmehI JyIMrDnK2QsjNPnCfqAo9gfbXr13P1VRYDjae6HX4bfbyPAn9vxlns0tcLFSE6/TOemK2D FpUy+cNtf4NC0zukRhi1FsUSU/q828XahSpz+jMBsySsuAlpLFv0cV7UnP6/dv+E3n4QB/ vaFmlDnhBELi5BbchBEgDKOcwE4Ddi6D2APofltVYJFxSMO+EXzsLQonYyXDg5wreh5gnV POt4VLyQ0iLYJ48vkxhAPItWKiSxnOl8dWSlys+AFx05+3n6c5L8NxqCz9jLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754658979; 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=jtJbCOK3fQlcNm3yz3zemE36dRCclLnwUSvQNG0D8J4=; b=W1+93CcaOLUumwlB68d8wJuOmYkYJY6vXyU5R2Y27sXJ5j4wjsC3HP9tN84y0C9HyXDTEs VZic82O6Cnm8YC5mwUhJtqdduKmIBSXWMsC+PqPP4mb4yGqiFmHY8qLFt7tk4+pKToPpWT 6FT7HHaMgq2R2R7WjYrndY+qZ9dFMSd6MiZtyc+9xnmWxtzlWHavprfnxE6D8ZEGSrxkQi kp57nB3kVSqMBYhAaD9jxW8WndfpqSM6WDGAFv5EJHkLQXgM3IFViFRxGcxrYtbHgiKoUX DwfxhZRYPMGcTuNz6Vb/YGq/H0gzMmBJfFjqYpqtZvRjRdGks9VEuiCvSBk4Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754658979; a=rsa-sha256; cv=none; b=qDLiRQ96royOGU//COKcJeH1glAdywjkwvaUjBD3kqFNQRSrLLsrqeb0uajUgvecVaQ73t MBZoNCGYecc07Jto1tq0Xe8vIlTqkKnZkaHA52USePBFc4NOgnjgW64/aBeyZEKJBYpDJZ NZCwK9ZPI11zrrCtG6+jZFsjbiGtabhTY9SpRd0TCUFID2Rd5xSdFtOeyCaWHaRdt+CtE7 CFij4qSImN1KDrzN6L3g3u8/zuA/xCjX1IxoA5fJyb773HtfrGQBN5mx70hLYialn2K7+q yoISKEavolL+xAfWZspFnVTWUd5CwzsocGcWt1W3Dm9EwuExfTvA/E0uhTEnOw== 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 4bz4Kv3hgZzdQ0; Fri, 08 Aug 2025 13:16:19 +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 578DGJRX094443; Fri, 8 Aug 2025 13:16:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578DGJ1B094440; Fri, 8 Aug 2025 13:16:19 GMT (envelope-from git) Date: Fri, 8 Aug 2025 13:16:19 GMT Message-Id: <202508081316.578DGJ1B094440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 2fb03d6c1142 - main - gssd: Be consistent about Makefile conditionals 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fb03d6c1142e5edca8e11beade756b4b4f02119 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb03d6c1142e5edca8e11beade756b4b4f02119 commit 2fb03d6c1142e5edca8e11beade756b4b4f02119 Author: Lexi Winter AuthorDate: 2025-08-08 12:49:36 +0000 Commit: Lexi Winter CommitDate: 2025-08-08 13:16:06 +0000 gssd: Be consistent about Makefile conditionals gssd itself is only built when both MK_GSSAPI and MK_KERBEROS_SUPPORT are enabled, but the init script and OptionalObsoleteFiles entries only checked MK_GSSAPI. Check both variables everywhere. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51812 --- libexec/rc/rc.d/Makefile | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 9cd61b96f59e..62285018cbef 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -219,7 +219,7 @@ FTPD= ftpd FTPDPACKAGE= ftpd .endif -.if ${MK_GSSAPI} != "no" +.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" CONFGROUPS+= GSSD GSSD= gssd GSSDPACKAGE= gssd diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8e5ac7fa2a63..b30604238855 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2259,6 +2259,12 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif +.if ${MK_GSSAPI} == "no" || ${MK_KERBEROS_SUPPORT} == "no" +OLD_FILES+=etc/rc.d/gssd +OLD_FILES+=usr/sbin/gssd +OLD_FILES+=usr/share/man/man8/gssd.8.gz +.endif + .if ${MK_GSSAPI} == no OLD_FILES+=usr/include/gssapi/gssapi.h OLD_DIRS+=usr/include/gssapi @@ -2270,7 +2276,6 @@ OLD_FILES+=usr/lib/libgssapi_p.a OLD_FILES+=usr/lib/librpcsec_gss.a OLD_FILES+=usr/lib/librpcsec_gss.so OLD_LIBS+=usr/lib/librpcsec_gss.so.1 -OLD_FILES+=usr/sbin/gssd OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz @@ -2329,7 +2334,6 @@ OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz OLD_FILES+=usr/share/man/man5/mech.5.gz OLD_FILES+=usr/share/man/man5/qop.5.gz -OLD_FILES+=usr/share/man/man8/gssd.8.gz .endif .if ${MK_HAST} == no