1dedfbb334
Resolves: upstream#3588 - sssd_nss consumes more memory until restarted
or machine swaps
Resolves: failure in glibc tests
https://sourceware.org/bugzilla/show_bug.cgi?id=22530
Resolves: upstream#3451 - When sssd is configured with id_provider proxy and
auth_provider ldap, login fails if the LDAP server
is not allowing anonymous binds
Resolves: upstream#3285 - SSSD needs restart after incorrect clock is
corrected with AD
Resolves: upstream#3586 - Give a more detailed debug and system-log message
if krb5_init_context() failed
Resolves: rhbz#1431153 - SSSD ships a drop-in configuration snippet
in /etc/systemd/system
Backport few upstream features from 1.16.1
107 lines
4.5 KiB
Diff
107 lines
4.5 KiB
Diff
From 536c8687921a0afe072bf81fca0bbb618a4c92fc Mon Sep 17 00:00:00 2001
|
|
From: Lukas Slebodnik <lslebodn@redhat.com>
|
|
Date: Tue, 24 Oct 2017 12:15:48 +0200
|
|
Subject: [PATCH 20/79] SYSTEMD: Add environment file to responder service
|
|
files
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
---
|
|
src/sysv/systemd/sssd-autofs.service.in | 1 +
|
|
src/sysv/systemd/sssd-ifp.service.in | 1 +
|
|
src/sysv/systemd/sssd-nss.service.in | 1 +
|
|
src/sysv/systemd/sssd-pac.service.in | 1 +
|
|
src/sysv/systemd/sssd-pam.service.in | 1 +
|
|
src/sysv/systemd/sssd-ssh.service.in | 1 +
|
|
src/sysv/systemd/sssd-sudo.service.in | 1 +
|
|
7 files changed, 7 insertions(+)
|
|
|
|
diff --git a/src/sysv/systemd/sssd-autofs.service.in b/src/sysv/systemd/sssd-autofs.service.in
|
|
index c2dc254c8f3f56cb6ae4dc481781688aa702b102..7f920ad66a46bb0785c3f947bc26c15d0e370259 100644
|
|
--- a/src/sysv/systemd/sssd-autofs.service.in
|
|
+++ b/src/sysv/systemd/sssd-autofs.service.in
|
|
@@ -10,6 +10,7 @@ Also=sssd-autofs.socket
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
ExecStartPre=-/bin/chown @SSSD_USER@:@SSSD_USER@ @logpath@/sssd_autofs.log
|
|
ExecStart=@libexecdir@/sssd/sssd_autofs ${DEBUG_LOGGER} --socket-activated
|
|
Restart=on-failure
|
|
diff --git a/src/sysv/systemd/sssd-ifp.service.in b/src/sysv/systemd/sssd-ifp.service.in
|
|
index 05a9a602b2d27c54a4faa79c58e0ecba90267100..f3bf92223ce8847858f57c2bb04b97c858be0ead 100644
|
|
--- a/src/sysv/systemd/sssd-ifp.service.in
|
|
+++ b/src/sysv/systemd/sssd-ifp.service.in
|
|
@@ -6,6 +6,7 @@ BindsTo=sssd.service
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
Type=dbus
|
|
BusName=org.freedesktop.sssd.infopipe
|
|
ExecStart=@ifp_exec_cmd@ ${DEBUG_LOGGER}
|
|
diff --git a/src/sysv/systemd/sssd-nss.service.in b/src/sysv/systemd/sssd-nss.service.in
|
|
index fe771ad0fa99968bb1d42037abf2f960271589b1..c671280f2c8a7f85fd09a72983a21db0c30df3b9 100644
|
|
--- a/src/sysv/systemd/sssd-nss.service.in
|
|
+++ b/src/sysv/systemd/sssd-nss.service.in
|
|
@@ -10,5 +10,6 @@ Also=sssd-nss.socket
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
ExecStart=@libexecdir@/sssd/sssd_nss ${DEBUG_LOGGER} --socket-activated
|
|
Restart=on-failure
|
|
diff --git a/src/sysv/systemd/sssd-pac.service.in b/src/sysv/systemd/sssd-pac.service.in
|
|
index dbd25abc476f579c9d8cce171fdeafa06e567610..590449b01223fe799eebb12b63229dfb8f2438f9 100644
|
|
--- a/src/sysv/systemd/sssd-pac.service.in
|
|
+++ b/src/sysv/systemd/sssd-pac.service.in
|
|
@@ -10,6 +10,7 @@ Also=sssd-pac.socket
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
ExecStartPre=-/bin/chown @SSSD_USER@:@SSSD_USER@ @logpath@/sssd_pac.log
|
|
ExecStart=@libexecdir@/sssd/sssd_pac ${DEBUG_LOGGER} --socket-activated
|
|
Restart=on-failure
|
|
diff --git a/src/sysv/systemd/sssd-pam.service.in b/src/sysv/systemd/sssd-pam.service.in
|
|
index df722d1f3014bf62cc60114c30331424d14f411b..f2e938579c7ef4254bb2e05231bfe83d7e20f395 100644
|
|
--- a/src/sysv/systemd/sssd-pam.service.in
|
|
+++ b/src/sysv/systemd/sssd-pam.service.in
|
|
@@ -10,6 +10,7 @@ Also=sssd-pam.socket sssd-pam-priv.socket
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
ExecStartPre=-/bin/chown @SSSD_USER@:@SSSD_USER@ @logpath@/sssd_pam.log
|
|
ExecStart=@libexecdir@/sssd/sssd_pam ${DEBUG_LOGGER} --socket-activated
|
|
Restart=on-failure
|
|
diff --git a/src/sysv/systemd/sssd-ssh.service.in b/src/sysv/systemd/sssd-ssh.service.in
|
|
index f41249ea0fe19e5044d5d06ba195ab604d8e6a29..1c185466dfa8c13804cc980bbbdbc997d4ebe955 100644
|
|
--- a/src/sysv/systemd/sssd-ssh.service.in
|
|
+++ b/src/sysv/systemd/sssd-ssh.service.in
|
|
@@ -10,6 +10,7 @@ Also=sssd-ssh.socket
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
ExecStartPre=-/bin/chown @SSSD_USER@:@SSSD_USER@ @logpath@/sssd_ssh.log
|
|
ExecStart=@libexecdir@/sssd/sssd_ssh ${DEBUG_LOGGER} --socket-activated
|
|
Restart=on-failure
|
|
diff --git a/src/sysv/systemd/sssd-sudo.service.in b/src/sysv/systemd/sssd-sudo.service.in
|
|
index da022f768af91e360182fad0ff885fad43ecfdc0..f13d88107eccd9e80447390c9c0f8940ae933106 100644
|
|
--- a/src/sysv/systemd/sssd-sudo.service.in
|
|
+++ b/src/sysv/systemd/sssd-sudo.service.in
|
|
@@ -10,6 +10,7 @@ Also=sssd-sudo.socket
|
|
|
|
[Service]
|
|
Environment=DEBUG_LOGGER=--logger=files
|
|
+EnvironmentFile=-@environment_file@
|
|
ExecStartPre=-/bin/chown @SSSD_USER@:@SSSD_USER@ @logpath@/sssd_sudo.log
|
|
ExecStart=@libexecdir@/sssd/sssd_sudo --socket-activated
|
|
Restart=on-failure
|
|
--
|
|
2.15.1
|
|
|