rpms/openssh
6
0
Fork 2
Code Issues Pull Requests Releases Activity

Fix regression of Match directive processing

Browse Source 
Related: RHEL-76317
This commit is contained in:
Dmitry Belyavskiy 2025-02-13 12:29:58 +01:00
parent b182959e95
commit 006127a476
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openssh-9.9p1-match-regression.patch
View File

@ -137,7 +137,7 @@ index 89b8413e..dd774f46 100644
/* Terminate on comment */ /* Terminate on comment */
if (*attrib == '#') { if (*attrib == '#') {
argv_consume(acp); /* mark all arguments consumed */ argv_consume(acp); /* mark all arguments consumed */
@@ -1062,11 +1063,13 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, @@ -1062,16 +1063,20 @@ match_cfg_line(const char *full_line, int *acp, char ***avp,
*arg != '\0' && *arg != '#')) { *arg != '\0' && *arg != '#')) {
error("'all' cannot be combined with other " error("'all' cannot be combined with other "
"Match attributes"); "Match attributes");
@ -153,6 +153,14 @@ index 89b8413e..dd774f46 100644
} }
/* Criterion "invalid-user" also has no argument */ /* Criterion "invalid-user" also has no argument */
if (strcasecmp(attrib, "invalid-user") == 0) { if (strcasecmp(attrib, "invalid-user") == 0) {
- if (ci == NULL)
+ if (ci == NULL) {
+ result = 0;
continue;
+ }
if (ci->user_invalid == 0)
result = 0;
else
@@ -1078,11 +1081,26 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, @@ -1078,11 +1081,26 @@ match_cfg_line(const char *full_line, int *acp, char ***avp,
debug("matched invalid-user at line %d", line); debug("matched invalid-user at line %d", line);
continue; continue;

8
openssh.spec
View File

@ -39,12 +39,12 @@
%{?static_openssl:%global static_libcrypto 1} %{?static_openssl:%global static_libcrypto 1}
%global openssh_ver 9.9p1 %global openssh_ver 9.9p1
%global openssh_rel 5 %global openssh_rel 6
Summary: An open source implementation of SSH protocol version 2 Summary: An open source implementation of SSH protocol version 2
Name: openssh Name: openssh
Version: %{openssh_ver} Version: %{openssh_ver}
Release: %{openssh_rel}%{?dist}.1 Release: %{openssh_rel}%{?dist}
URL: http://www.openssh.com/portable.html URL: http://www.openssh.com/portable.html
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@ -666,6 +666,10 @@ test -f %{sysconfig_anaconda} && \
%attr(0755,root,root) %{_libdir}/sshtest/sk-dummy.so %attr(0755,root,root) %{_libdir}/sshtest/sk-dummy.so
%changelog %changelog
* Thu Feb 13 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-6
- Fix regression of Match directive processing
Related: RHEL-76317
* Mon Jan 27 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-5 * Mon Jan 27 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.9p1-5
- Fix regression of Match directive processing - Fix regression of Match directive processing
Resolves: RHEL-76317 Resolves: RHEL-76317