The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=665bf6ffb500f63b58cf971c99bb9d3f1413af9b
commit 665bf6ffb500f63b58cf971c99bb9d3f1413af9b
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2025-08-18 16:04:06 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2025-08-26 19:13:07 +0000
sshd-auth: Chase MK_GSSAPI changes
Fixes: 8e28d84935f2 ("OpenSSH: Update to 10.0p2")
Sponsored by: The FreeBSD Foundation
---
secure/libexec/sshd-auth/Makefile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/secure/libexec/sshd-auth/Makefile
b/secure/libexec/sshd-auth/Makefile
index 6fc0626982db..a127b50b407a 100644
--- a/secure/libexec/sshd-auth/Makefile
+++ b/secure/libexec/sshd-auth/Makefile
@@ -38,16 +38,15 @@ LIBADD+= blacklist
LDFLAGS+=-L${LIBBLACKLISTDIR}
.endif
-.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
-LIBADD+= gssapi_krb5 gssapi krb5
+.if ${MK_KERBEROS_SUPPORT} != "no"
.if ${MK_MITKRB5} != "no"
+LIBADD+= gssapi_krb5 krb5
.include "../../krb5/Makefile.inc"
CFLAGS+= -I${KRB5_DIR}/include \
-I${KRB5_SRCTOP}/include \
- -I${KRB5_OBJTOP}/lib \
- -I${KRB5_DIR}/lib/gssapi/generic \
- -I${KRB5_DIR}/lib/gssapi/krb5 \
- -I${KRB5_DIR}/lib/gssapi/mechglue
+ -I${KRB5_OBJTOP}/lib
+.else
+LIBADD+= gssapi_krb5 gssapi krb5
.endif
.endif
