rpms/gdm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Correct logic error leading to wrong display server preference getting chosen

Browse Source
This commit is contained in:
Ray Strode 2021-07-27 07:09:30 -04:00
parent 1b45c3bcef
commit 5ed4a6291a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0003-local-display-factory-Fix-overrun-in-session-type-li.patch
View File

@ -67,7 +67,7 @@ index 0bb3851f..f2da3b6e 100644
- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) - if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) )
- session_types[number_of_session_types++] = "wayland"; - session_types[number_of_session_types++] = "wayland";
+ if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE)) { + if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE)) {
+ session_types[i] = "wayland"; + session_types[i] = "wayland"; continue;
+ } + }
} }
} }
@ -81,7 +81,7 @@ index 0bb3851f..f2da3b6e 100644
- if (xorg_enabled && g_file_test ("/usr/bin/Xorg", G_FILE_TEST_IS_EXECUTABLE) ) - if (xorg_enabled && g_file_test ("/usr/bin/Xorg", G_FILE_TEST_IS_EXECUTABLE) )
- session_types[number_of_session_types++] = "x11"; - session_types[number_of_session_types++] = "x11";
+ if (xorg_enabled && g_file_test ("/usr/bin/Xorg", G_FILE_TEST_IS_EXECUTABLE)) { + if (xorg_enabled && g_file_test ("/usr/bin/Xorg", G_FILE_TEST_IS_EXECUTABLE)) {
+ session_types[i] = "x11"; + session_types[i] = "x11"; continue;
+ } + }
} }
} }

6
gdm.spec
View File

@ -11,7 +11,7 @@
Name: gdm Name: gdm
Epoch: 1 Epoch: 1
Version: 40.0 Version: 40.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
License: GPLv2+ License: GPLv2+
@ -307,6 +307,10 @@ fi
%{_libdir}/pkgconfig/gdm-pam-extensions.pc %{_libdir}/pkgconfig/gdm-pam-extensions.pc
%changelog %changelog
* Tue Jul 27 2021 Ray Strode <rstrode@redhat.com> - 1:40.0-5
- Correct logic error leading to wrong display server preference
getting chosen.
* Thu Jul 22 2021 Ray Strode <rstrode@redhat.com> - 1:40.0-4 * Thu Jul 22 2021 Ray Strode <rstrode@redhat.com> - 1:40.0-4
- Allow vendor nvidia driver users the ability to pick wayland sessions - Allow vendor nvidia driver users the ability to pick wayland sessions
without editing udev without editing udev