New upstream version 1.10.8 upstream/1.10.8

1 files changed, 22 insertions, 17 deletions

diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 117a3815..0f40ff7c 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -33,7 +33,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-dbus-manager.h"
+#include "nm-bus-manager.h"
+#include "NetworkManagerUtils.h"
 
 enum {
 	PROP_0,
@@ -92,15 +93,17 @@ 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_strlcpy (buf, "internal", buf_len);
+		g_strlcat (buf, "internal", buf_len);
 		break;
 	default:
-		g_strlcpy (buf, "invalid", buf_len);
+		g_strlcat (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)
@@ -122,6 +125,8 @@ nm_auth_subject_unix_process_to_polkit_gvariant (NMAuthSubject *self)
 	return ret;
 }
 
+#endif
+
 NMAuthSubjectType
 nm_auth_subject_get_subject_type (NMAuthSubject *subject)
 {
@@ -181,20 +186,20 @@ _new_unix_process (GDBusMethodInvocation *context,
 	g_return_val_if_fail (context || (connection && message), NULL);
 
 	if (context) {
-		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);
-	}
+		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 ();
 
 	if (!success)
 		return NULL;