Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A couple of cosmetic changes related to IFP: #6868

Closed
wants to merge 2 commits into from
Closed

A couple of cosmetic changes related to IFP: #6868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7918e6c
SBUS: warn loudly if bus denies access
alexey-tikhonov Aug 9, 2023
aaa3db8
IFP: add a comment to 'org.freedesktop.sssd.infopipe.service'
alexey-tikhonov Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 =
Expand Down Expand Up @@ -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'

Expand Down
1 change: 1 addition & 0 deletions src/responder/ifp/org.freedesktop.sssd.infopipe.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[D-BUS Service]
Name=org.freedesktop.sssd.infopipe
@ifp_dbus_exec_comment@
Exec=@ifp_exec_cmd@
User=root
@ifp_systemdservice@
10 changes: 8 additions & 2 deletions src/sbus/connection/sbus_dbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ sbus_dbus_request_name(DBusConnection *dbus_conn, const char *name)

dbret = dbus_bus_request_name(dbus_conn, name, flags, &dbus_error);
if (dbret == -1) {
DEBUG(SSSDBG_CRIT_FAILURE, "Unable to request name on the "
"system bus [%s]: %s\n", dbus_error.name, dbus_error.message);
DEBUG(SSSDBG_CRIT_FAILURE, "Unable to request name '%s' on the system"
" bus [%s]: %s\n", name, dbus_error.name, dbus_error.message);
if (dbus_error_has_name(&dbus_error, DBUS_ERROR_ACCESS_DENIED)) {
DEBUG(SSSDBG_FATAL_FAILURE,
"Access denied - check dbus service configuration.\n");
sss_log(SSS_LOG_CRIT, "SSSD dbus service can't acquire bus name"
" - check dbus service configuration.");
}
ret = EIO;
goto done;
} else if (dbret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
Expand Down
Loading