colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: switch code to nm_session_monitor_session_exists()

Browse Source 
Acked-By: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Pavel Šimerda
2015-01-02 21:20:38 +01:00
parent 335bbc6335
commit 5fb31ba5d1
5 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nm-auth-utils.c
View File

@@ -425,7 +425,6 @@ nm_auth_is_subject_in_acl (NMConnection *connection,
{
NMSettingConnection *s_con;
const char *user = NULL;
GError *local = NULL;
gulong uid;
g_return_val_if_fail (connection != NULL, FALSE);
@@ -443,17 +442,13 @@ nm_auth_is_subject_in_acl (NMConnection *connection,
return TRUE;
/* Reject the request if the request comes from no session at all */
if (!nm_session_monitor_uid_has_session (smon, uid, &user, &local)) {
if (out_error_desc) {
*out_error_desc = g_strdup_printf ("No session found for uid %lu (%s)",
uid,
local && local->message ? local->message : "unknown");
}
g_clear_error (&local);
if (!nm_session_monitor_session_exists (uid, FALSE)) {
if (out_error_desc)
*out_error_desc = g_strdup_printf ("No session found for uid %lu", uid);
return FALSE;
}
if (!user) {
if (!nm_session_monitor_uid_to_user (uid, &user)) {
if (out_error_desc)
*out_error_desc = g_strdup_printf ("Could not determine username for uid %lu", uid);
return FALSE;