From 87593a5ecb13726cc0cb02c68667013829318cf5 Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Wed, 9 Aug 2023 19:56:10 +0200 Subject: [PATCH] IFP: add a comment to 'org.freedesktop.sssd.infopipe.service' to avoid potential confusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Alejandro López Reviewed-by: Justin Stephenson (cherry picked from commit d91c944c9f481ee1c78acab686d06452cbe9b81a) --- Makefile.am | 3 +++ src/responder/ifp/org.freedesktop.sssd.infopipe.service.in | 1 + 2 files changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index 11c9a0df2ad..a3952ce78d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ sssdkcmdatadir = $(datadir)/sssd-kcm deskprofilepath = $(sss_statedir)/deskprofile if HAVE_SYSTEMD_UNIT +ifp_dbus_exec_comment = \# If system is configured to use systemd ifp service ("SystemdService=") then "Exec=" and "User=" options are not used ifp_exec_cmd = $(sssdlibexecdir)/sssd_ifp --uid 0 --gid 0 --dbus-activated ifp_systemdservice = SystemdService=sssd-ifp.service ifp_restart = Restart=on-failure @@ -105,6 +106,7 @@ if SSSD_NON_ROOT_USER additional_caps = CAP_DAC_OVERRIDE endif else +ifp_dbus_exec_comment = \# "sss_signal" is used to force SSSD monitor to trigger "sssd_ifp" reconnection to dbus ifp_exec_cmd = $(sssdlibexecdir)/sss_signal ifp_systemdservice = ifp_restart = @@ -1746,6 +1748,7 @@ EXTRA_DIST += \ ifp_edit_cmd = $(edit_cmd) \ -e 's|@ifp_exec_cmd[@]|$(ifp_exec_cmd)|g' \ + -e 's|@ifp_dbus_exec_comment[@]|$(ifp_dbus_exec_comment)|g' \ -e 's|@ifp_systemdservice[@]|$(ifp_systemdservice)|g' \ -e 's|@ifp_restart[@]|$(ifp_restart)|g' diff --git a/src/responder/ifp/org.freedesktop.sssd.infopipe.service.in b/src/responder/ifp/org.freedesktop.sssd.infopipe.service.in index ee77f41bd56..ca06cb185c2 100644 --- a/src/responder/ifp/org.freedesktop.sssd.infopipe.service.in +++ b/src/responder/ifp/org.freedesktop.sssd.infopipe.service.in @@ -1,5 +1,6 @@ [D-BUS Service] Name=org.freedesktop.sssd.infopipe +@ifp_dbus_exec_comment@ Exec=@ifp_exec_cmd@ User=root @ifp_systemdservice@