diff options
| author | Michael Biebl <biebl@debian.org> | 2018-04-23 18:00:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-04-23 18:00:21 +0200 |
| commit | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (patch) | |
| tree | 2dd55c4ab0fdcbe9cddb26adb4a554b1a45c73c8 /src/nm-auth-subject.c | |
| parent | 7e9ff09fcb2366b383b7ebbec80d2f6fff117290 (diff) | |
New upstream version 1.11.3 upstream/1.11.3
Diffstat (limited to 'src/nm-auth-subject.c')
| -rw-r--r-- | src/nm-auth-subject.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 0f40ff7c..117a3815 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -33,8 +33,7 @@ #include <string.h> #include <stdlib.h> -#include "nm-bus-manager.h" -#include "NetworkManagerUtils.h" +#include "nm-dbus-manager.h" enum { PROP_0, @@ -93,17 +92,15 @@ nm_auth_subject_to_string (NMAuthSubject *self, char *buf, gsize buf_len) (unsigned long long) priv->unix_process.start_time); break; case NM_AUTH_SUBJECT_TYPE_INTERNAL: - g_strlcat (buf, "internal", buf_len); + g_strlcpy (buf, "internal", buf_len); break; default: - g_strlcat (buf, "invalid", buf_len); + g_strlcpy (buf, "invalid", buf_len); break; } return buf; } -#if WITH_POLKIT - /* returns a floating variant */ GVariant * nm_auth_subject_unix_process_to_polkit_gvariant (NMAuthSubject *self) @@ -125,8 +122,6 @@ nm_auth_subject_unix_process_to_polkit_gvariant (NMAuthSubject *self) return ret; } -#endif - NMAuthSubjectType nm_auth_subject_get_subject_type (NMAuthSubject *subject) { @@ -186,20 +181,20 @@ _new_unix_process (GDBusMethodInvocation *context, g_return_val_if_fail (context || (connection && message), NULL); if (context) { - success = nm_bus_manager_get_caller_info (nm_bus_manager_get (), - context, - &dbus_sender, - &uid, - &pid); - } else if (message) { - success = nm_bus_manager_get_caller_info_from_message (nm_bus_manager_get (), - connection, - message, - &dbus_sender, - &uid, - &pid); - } else - g_assert_not_reached (); + success = nm_dbus_manager_get_caller_info (nm_dbus_manager_get (), + context, + &dbus_sender, + &uid, + &pid); + } else { + nm_assert (message); + success = nm_dbus_manager_get_caller_info_from_message (nm_dbus_manager_get (), + connection, + message, + &dbus_sender, + &uid, + &pid); + } if (!success) return NULL; |