forked from pool/systemd
98c62cc989
- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch from the filelist. - libpcre, glib2 and libusb are not used by systemd, remove from buildrequires. - 1032-ata_id-unbotch-format-specifier.patch: fix udev ata_id output. - 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch fix StopWhenUnneeded=true in combination with a Requisite= dependency. - 0031-install-fix-bad-memory-access.patch: Fix Bad memory access - 0006-pam_systemd-Properly-check-kdbus-availability.patch: if kdbus is enabled (i.e boot with kdbus=1) DBUS_SESSION_BUS_ADDRESS must not be exported. - spec: add a min_kernel_version macro to ensure the package conflicts with kernel versions in which systemd cannot run. - sysctl-handle-boot-sysctl.conf-kernel_release.patch dropped, replaced by a tmpfiles.d snippet "current-kernel-sysctl.conf" (feature implemented in v220 just for our usecase) - fix build when resolved is enabled - remove fsck -l test in spec file, systemd requires util-linux 2.26 or later where this feature is already available. - remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch from the filelist. - libpcre, glib2 and libusb are not used by systemd, remove OBS-URL: https://build.opensuse.org/request/show/313718 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=878
28 lines
965 B
Diff
28 lines
965 B
Diff
From c5d452bb228e9f97ebc96be98a957c0b7b8072eb Mon Sep 17 00:00:00 2001
|
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
|
Date: Sun, 21 Jun 2015 05:59:34 +0200
|
|
Subject: [PATCH 06/32] pam_systemd: Properly check kdbus availability
|
|
|
|
This properly avoids setting DBUS_SESSION_BUS_ADDRESS if kdbus
|
|
is loaded (or built into the kernel) but not wanted.
|
|
---
|
|
src/login/pam_systemd.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
|
|
index 0ebdfdf..dd192b9 100644
|
|
--- a/src/login/pam_systemd.c
|
|
+++ b/src/login/pam_systemd.c
|
|
@@ -181,7 +181,7 @@ static int export_legacy_dbus_address(
|
|
int r;
|
|
|
|
/* skip export if kdbus is not active */
|
|
- if (access("/sys/fs/kdbus", F_OK) < 0)
|
|
+ if (!is_kdbus_available())
|
|
return PAM_SUCCESS;
|
|
|
|
if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) {
|
|
--
|
|
2.4.3
|
|
|