fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-03 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: handle return values from libsystemd-login correctly

Browse source 
The functions return an 'int', which can be < 0 for errors, so
we can't just treat the return value as a boolean.
This commit is contained in:
Dan Williams 2012-08-23 13:54:02 -05:00
parent 052a24343e
commit 9379a729f4
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nm-session-monitor-systemd.c
View file

@ -31,6 +31,7 @@
#include "nm-session-utils.h"
#include "nm-session-monitor.h"
#include "nm-logging.h"
/********************************************************************/
@ -236,10 +237,18 @@ nm_session_monitor_uid_has_session (NMSessionMonitor *monitor,
const char **out_user,
GError **error)
{
int ret;
if (!nm_session_uid_to_user (uid, out_user, error))
return FALSE;
return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
ret = sd_uid_get_sessions (uid, FALSE, NULL) > 0;
if (ret < 0) {
nm_log_warn (LOGD_CORE, "Failed to get systemd sessions for uid %d: %d",
uid, ret);
return FALSE;
}
return ret > 0 ? TRUE : FALSE;
}
gboolean
@ -247,5 +256,13 @@ nm_session_monitor_uid_active (NMSessionMonitor *monitor,
uid_t uid,
GError **error)
{
return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
int ret;
ret = sd_uid_get_sessions (uid, TRUE, NULL) > 0;
if (ret < 0) {
nm_log_warn (LOGD_CORE, "Failed to get active systemd sessions for uid %d: %d",
uid, ret);
return FALSE;
}
return ret > 0 ? TRUE : FALSE;
}