From nobody Mon Jun 16 02:51:53 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 4bLDzs5QVKz5yMxY; Mon, 16 Jun 2025 02:51:53 +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 4bLDzs41CTz3Rwr; Mon, 16 Jun 2025 02:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042313; 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=FqraYLTYQOzzILh6dWsnkEevYKhXQj0TOj+bKu1uL8s=; b=J8TEp8DG9BgRapyyQOUNeJX9jBd2oVeNLU8TCfIqr0eN86rNctkzY322sjgCD1BXzJyYP+ P+nB1B2vfKaNiYDXEFxAfESl8ommynRu4ML8ignEUTaFemQ6+qd3rQd9wzj01isRMOipjo wEjGlgqTCe1LqyNEhB/CPva+J7n3E1urcsqu92AxfJJhgtTu8Pbrk1PdEUmgJJzRQ/1lVf RmAroxZ905fnpgKEa7dUv0GsUxNUJQl9K55MPM82k4JCm/Ufsk6medIWIWAFqlt00++0hM IA2EcJwEn937yXY4knkxTooZm98mx+NjWh/GHgboab4YAE8fAar4Dd1Bg5kZ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750042313; 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=FqraYLTYQOzzILh6dWsnkEevYKhXQj0TOj+bKu1uL8s=; b=Z9CjOcwDvJtoeBDJn4VwIIlF59Ir0MMkWxBVVdszh3gSPlerUPhqIrAUHZW2LzUdeboZ5W hTW5BkvkUdPezIWvjZAfnwam75i28NzTOLbBES+ImZbdR4cC6AQJ13LY+ELkQqESN7hsOZ MYUUT4ipaeI9QG8e5Z8ip6Am++Pn0hoiDgXEpJ1ZvqkfyWKHLlsj73eoZ9nq8ODe1Nu8vb 1+PFCQejtFs8NJxugDM3fW7nPobwmAdknCB24Mt15k/cPnnZLjnTPvyEnY7q8qwqgyS39g +sWUBaKr4AJFkF/+uqWxmLOg1RYAIhiM1ZEwmO98VakWyALEBdgAWKNiORDb1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750042313; a=rsa-sha256; cv=none; b=uAA2ORTFTS1uIq7oXBpc4dr5ZMlLk+AXCFyBHDiUck8uwEDWIDRq+2SvNqkjInJ00zcFVR hnYPF90A+jR1nskYqB89HuSJVSs31wbvF8zefXMzdf1zHVWVeY9ApVmQ6kKerrS4a2yHIA GftITOMbUjV9tlHuo2g4XL2jr4WOfRMttGl/N1q5jhV8UTDMTNQRj7mvFQt6mtzr+aBPXo pp0VS+k+9+Se8Oz8FDETkhxDBL0CkdFpVIz1pBvOPeWdVN6r/VBZyaZwTfPB2MfGTtsE5U EmkRQRXne9Op8SZb3/o/YyabkPnlSNOAZpW+kddOGtoRuCkTHL1y3s1Cuh1AuQ== 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 4bLDzs3VJ6zgkK; Mon, 16 Jun 2025 02:51:53 +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 55G2prQh063055; Mon, 16 Jun 2025 02:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G2prBb063050; Mon, 16 Jun 2025 02:51:53 GMT (envelope-from git) Date: Mon, 16 Jun 2025 02:51:53 GMT Message-Id: <202506160251.55G2prBb063050@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: 8f18d513c03a - main - gssd: Add support for MIT KRB5 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: 8f18d513c03afd64e0fa7cf2bea382d4de24324f Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8f18d513c03afd64e0fa7cf2bea382d4de24324f commit 8f18d513c03afd64e0fa7cf2bea382d4de24324f Author: Cy Schubert AuthorDate: 2025-06-11 02:31:31 +0000 Commit: Cy Schubert CommitDate: 2025-06-16 02:49:36 +0000 gssd: Add support for MIT KRB5 Fix gssd build when building with MIT KRB5. krb5_get_init_creds_opt_set_default_flags() is not an MIT KRB5 function. It is also not needed to resolve the default keytable. Sponsored by: The FreeBSD Foundation Reviewed by: rmacklem Differential revision: https://reviews.freebsd.org/D50810 --- usr.sbin/gssd/Makefile | 7 +++++++ usr.sbin/gssd/gssd.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile index e30463ddf50b..7ad1cae7eb55 100644 --- a/usr.sbin/gssd/Makefile +++ b/usr.sbin/gssd/Makefile @@ -11,7 +11,14 @@ WARNS?= 1 LIBADD= gssapi .if ${MK_KERBEROS_SUPPORT} != "no" +.if ${MK_MITKRB5} != "no" +# MIT KRB5 +LIBADD+= krb5 k5crypto krb5profile krb5support +CFLAGS+= -DMK_MITKRB5=yes +.else +# Heimdal LIBADD+= krb5 roken +.endif .else CFLAGS+= -DWITHOUT_KERBEROS .endif diff --git a/usr.sbin/gssd/gssd.c b/usr.sbin/gssd/gssd.c index d1d5c2119ab5..c6d9f01131f7 100644 --- a/usr.sbin/gssd/gssd.c +++ b/usr.sbin/gssd/gssd.c @@ -1189,8 +1189,11 @@ gssd_get_cc_from_keytab(const char *name) if (ret == 0) ret = krb5_cc_initialize(context, ccache, principal); if (ret == 0) { +#ifndef MK_MITKRB5 + /* For Hemdal only */ krb5_get_init_creds_opt_set_default_flags(context, "gssd", krb5_principal_get_realm(context, principal), opt); +#endif kt_ret = ret = krb5_kt_default(context, &kt); } if (ret == 0)