[packages/openssh] upstream fix for gss option names regression; rel 2
atler
atler at pld-linux.org
Tue Jul 7 13:15:12 CEST 2026
commit 002f2857895899d2d7c9c6ae0331c63f49f201f5
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Jul 7 13:10:05 2026 +0200
upstream fix for gss option names regression; rel 2
caused caufiguration parsing error (even in default setup) leading to
startup failure:
sshd[31448]: /etc/ssh/sshd_config.d/50-pld.conf: line 3: Bad configuration option: GSSAPIAuthentication
sshd[31448]: /etc/ssh/sshd_config.d/50-pld.conf: terminating, 1 bad configuration options
gss-opts.patch | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
openssh.spec | 5 +--
2 files changed, 101 insertions(+), 2 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index b2dc78d..b9cdefe 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -37,7 +37,7 @@ Summary(ru.UTF-8): OpenSSH - свободная реализация прото
Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
Name: openssh
Version: 10.4p1
-Release: 1
+Release: 2
Epoch: 2
License: BSD
Group: Applications/Networking
@@ -70,7 +70,7 @@ Patch8: ldap-helper-sigpipe.patch
# High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
# http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz
Patch9: %{name}-5.2p1-hpn13v6.diff
-
+Patch10: gss-opts.patch
Patch11: %{name}-chroot.patch
Patch13: %{name}-skip-interop-tests.patch
@@ -553,6 +553,7 @@ openldap-a.
%{?with_hpn:%patch -P9 -p1}
+%patch -P10 -p1
%patch -P11 -p1
%patch -P13 -p1
diff --git a/gss-opts.patch b/gss-opts.patch
new file mode 100644
index 0000000..b948599
--- /dev/null
+++ b/gss-opts.patch
@@ -0,0 +1,98 @@
+From c147093565634eae9f91e4df99e04a6b3513f9c6 Mon Sep 17 00:00:00 2001
+From: "djm at openbsd.org" <djm at openbsd.org>
+Date: Tue, 7 Jul 2026 01:00:22 +0000
+Subject: [PATCH] upstream: fix GSSAPI option names, that I somehow screwed up
+ while
+
+refactoring servconf.c bz3974 patch from Colin Watson
+
+OpenBSD-Commit-ID: be39ad3dbe36d9ecdb86f3811da5dfbdc9bcb1e6
+---
+ servconf.c | 18 +++++++++---------
+ servconf.h | 18 +++++++++---------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/servconf.c b/servconf.c
+index ce388f1dd93f..9b443bea0673 100644
+--- a/servconf.c
++++ b/servconf.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: servconf.c,v 1.450 2026/06/29 08:59:31 djm Exp $ */
++/* $OpenBSD: servconf.c,v 1.451 2026/07/07 01:00:22 djm Exp $ */
+ /*
+ * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
+ * All rights reserved
+@@ -1433,19 +1433,19 @@ process_server_config_line_depth(ServerOptions *options, char *line,
+ #endif /* KRB5 */
+
+ #ifdef GSSAPI
+- case sGssAuthentication:
++ case sGSSAPIAuthentication:
+ intptr = &options->gss_authentication;
+ goto parse_flag;
+
+- case sGssCleanupCreds:
++ case sGSSAPICleanupCredentials:
+ intptr = &options->gss_cleanup_creds;
+ goto parse_flag;
+
+- case sGssDelegateCreds:
++ case sGSSAPIDelegateCredentials:
+ intptr = &options->gss_deleg_creds;
+ goto parse_flag;
+
+- case sGssStrictAcceptor:
++ case sGSSAPIStrictAcceptorCheck:
+ intptr = &options->gss_strict_acceptor;
+ goto parse_flag;
+ #endif /* GSSAPI */
+@@ -4215,10 +4215,10 @@ dump_config(ServerOptions *o)
+ # endif
+ #endif
+ #ifdef GSSAPI
+- dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
+- dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
+- dump_cfg_fmtint(sGssDelegateCreds, o->gss_deleg_creds);
+- dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
++ dump_cfg_fmtint(sGSSAPIAuthentication, o->gss_authentication);
++ dump_cfg_fmtint(sGSSAPICleanupCredentials, o->gss_cleanup_creds);
++ dump_cfg_fmtint(sGSSAPIDelegateCredentials, o->gss_deleg_creds);
++ dump_cfg_fmtint(sGSSAPIStrictAcceptorCheck, o->gss_strict_acceptor);
+ #endif
+ dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
+ dump_cfg_fmtint(sKbdInteractiveAuthentication,
+diff --git a/servconf.h b/servconf.h
+index 9e64e4673743..a2345e88a461 100644
+--- a/servconf.h
++++ b/servconf.h
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: servconf.h,v 1.177 2026/05/31 11:30:50 djm Exp $ */
++/* $OpenBSD: servconf.h,v 1.179 2026/07/07 01:00:22 djm Exp $ */
+
+ /*
+ * Author: Tatu Ylonen <ylo at cs.hut.fi>
+@@ -314,16 +314,16 @@ SSHCONF_UNSUPPORTED_INT(kerberos_get_afs_token, KerberosGetAFSToken, SSHCFG_GLOB
+
+ #ifdef GSSAPI
+ #define SSHD_CONFIG_ENTRIES_GSS \
+-SSHCONF_INTFLAG(gss_authentication, GssAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \
+-SSHCONF_INTFLAG(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
+-SSHCONF_INTFLAG(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
+-SSHCONF_INTFLAG(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE)
++SSHCONF_INTFLAG(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \
++SSHCONF_INTFLAG(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
++SSHCONF_INTFLAG(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
++SSHCONF_INTFLAG(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE)
+ #else /* GSSAPI */
+ #define SSHD_CONFIG_ENTRIES_GSS \
+-SSHCONF_UNSUPPORTED_INT(gss_authentication, GssAuthentication, SSHCFG_ALL) \
+-SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL) \
+-SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL) \
+-SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL)
++SSHCONF_UNSUPPORTED_INT(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL) \
++SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL) \
++SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL) \
++SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL)
+ #endif /* GSSAPI */
+
+ #define SSHD_CONFIG_ENTRIES \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/002f2857895899d2d7c9c6ae0331c63f49f201f5
More information about the pld-cvs-commit
mailing list