diff options
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-dbus.c | 8 | ||||
| -rw-r--r-- | src/login/systemd-user.m4 | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 47fc53167e..20794451f5 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2567,7 +2567,7 @@ static int method_can_reboot_parameter( void *userdata, sd_bus_error *error) { - Manager *m = userdata; + _unused_ Manager *m = userdata; int r; assert(message); @@ -2699,7 +2699,7 @@ static int method_can_reboot_to_firmware_setup( void *userdata, sd_bus_error *error) { - Manager *m = userdata; + _unused_ Manager *m = userdata; int r; assert(message); @@ -2888,7 +2888,7 @@ static int method_can_reboot_to_boot_loader_menu( void *userdata, sd_bus_error *error) { - Manager *m = userdata; + _unused_ Manager *m = userdata; int r; assert(message); @@ -3079,7 +3079,7 @@ static int method_can_reboot_to_boot_loader_entry( void *userdata, sd_bus_error *error) { - Manager *m = userdata; + _unused_ Manager *m = userdata; int r; assert(message); diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 index 4f85b4b7fe..f6313f79fe 100644 --- a/src/login/systemd-user.m4 +++ b/src/login/systemd-user.m4 @@ -2,11 +2,19 @@ # # Used by systemd --user instances. -account required pam_unix.so +m4_ifdef(`ENABLE_HOMED', +-account sufficient pam_systemd_home.so +)m4_dnl +account sufficient pam_unix.so +account required pam_permit.so + m4_ifdef(`HAVE_SELINUX', session required pam_selinux.so close session required pam_selinux.so nottys open )m4_dnl session required pam_loginuid.so session optional pam_keyinit.so force revoke +m4_ifdef(`ENABLE_HOMED', +-session optional pam_systemd_home.so +)m4_dnl session optional pam_systemd.so |