upstream: Make ssh optionally build with Kerberos 5 against the

Heimdal port. This updates the Makefiles and repairs some bitrot in headers,
resyncing them against Portable.  To do this, "pkg_add heimdal" then "make
KERBEROS5=yes".  ok djm@

(ID sync only)

OpenBSD-Commit-ID: 31f95c9ba58aa7ba89264f1d80c79106042b1095

diff --git a/auth2-gss.c b/auth2-gss.c
index 0a91af7e266c4dad30b32d774abf75c0b0cc28f1..9228f775d27f607ad56605ebfc9e3c4fa0fcc579 100644 (file)
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-gss.c,v 1.37 2026/02/07 18:04:53 dtucker Exp $ */
+/* $OpenBSD: auth2-gss.c,v 1.38 2026/02/08 15:28:01 dtucker Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.

diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index a151bc1e4ad2f2db5d7c22125029c41b531612a5..4caac337c1d2ea0aec13d9fbc81dcdb94913c6bf 100644 (file)
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv-krb5.c,v 1.9 2018/07/09 21:37:55 markus Exp $ */
+/* $OpenBSD: gss-serv-krb5.c,v 1.10 2026/02/08 15:28:01 dtucker Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.

diff --git a/gss-serv.c b/gss-serv.c
index 0ef5018e569b87d4e531c09fe3e822d81c0381c6..877333ce9c04412ed916ffc98412f19954e51a8c 100644 (file)
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv.c,v 1.35 2025/12/22 03:12:05 djm Exp $ */
+/* $OpenBSD: gss-serv.c,v 1.36 2026/02/08 15:28:01 dtucker Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.

diff --git a/session.c b/session.c
index 778b6d63cfd7d45da011feba79ac150347e91cf3..926cc2b81c2d4c676440be154cf5fb61e45115fc 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.346 2026/02/06 22:59:18 dtucker Exp $ */
+/* $OpenBSD: session.c,v 1.347 2026/02/08 15:28:01 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved

diff --git a/sshd.c b/sshd.c
index 03c40f66ca8e39accd21eab4a1bac6aeadbc55b8..2d5634057945dcf8c4abcadf1b646b439be660b3 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.624 2025/12/16 08:32:50 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.625 2026/02/08 15:28:01 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  * Copyright (c) 2002 Niels Provos.  All rights reserved.