fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-19 07:48:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

agents: create correct proxy for agents connecting via a private connection

Browse source 
We need to use dbus_g_proxy_new_for_peer() when talking to agents on a
private connection.
This commit is contained in:
Dan Williams 2013-03-04 08:55:15 -06:00
parent b6b09a5f11
commit 6326aea61b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/nm-agent-manager.c
View file

@ -305,7 +305,7 @@ impl_agent_manager_register (NMAgentManager *self,
}
/* Success, add the new agent */
agent = nm_secret_agent_new (priv->dbus_mgr, sender, identifier, sender_uid);
agent = nm_secret_agent_new (context, sender, identifier, sender_uid);
if (!agent) {
error = g_error_new_literal (NM_AGENT_MANAGER_ERROR,
NM_AGENT_MANAGER_ERROR_INTERNAL_ERROR,

14
src/settings/nm-secret-agent.c
View file

@ -29,6 +29,7 @@
#include "NetworkManager.h"
#include "nm-secret-agent.h"
#include "nm-dbus-manager.h"
#include "nm-dbus-glib-types.h"
#include "nm-logging.h"
@ -50,7 +51,6 @@ typedef struct {
GSList *permissions;
NMDBusManager *dbus_mgr;
DBusGProxy *proxy;
GHashTable *requests;
@ -419,14 +419,14 @@ nm_secret_agent_delete_secrets (NMSecretAgent *self,
/*************************************************************/
NMSecretAgent *
nm_secret_agent_new (NMDBusManager *dbus_mgr,
nm_secret_agent_new (DBusGMethodInvocation *context,
const char *owner,
const char *identifier,
uid_t owner_uid)
{
NMSecretAgent *self;
NMSecretAgentPrivate *priv;
DBusGConnection *bus;
NMDBusManager *dbus_mgr;
char *hash_str, *username;
struct passwd *pw;
@ -450,13 +450,14 @@ nm_secret_agent_new (NMDBusManager *dbus_mgr,
priv->hash = g_str_hash (hash_str);
g_free (hash_str);
priv->dbus_mgr = g_object_ref (dbus_mgr);
bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
priv->proxy = dbus_g_proxy_new_for_name (bus,
dbus_mgr = nm_dbus_manager_get ();
priv->proxy = nm_dbus_manager_new_proxy (dbus_mgr,
context,
owner,
NM_DBUS_PATH_SECRET_AGENT,
NM_DBUS_INTERFACE_SECRET_AGENT);
g_assert (priv->proxy);
g_object_unref (dbus_mgr);
g_free (username);
return self;
@ -489,7 +490,6 @@ dispose (GObject *object)
g_hash_table_destroy (priv->requests);
g_object_unref (priv->proxy);
g_object_unref (priv->dbus_mgr);
}
G_OBJECT_CLASS (nm_secret_agent_parent_class)->dispose (object);

2
src/settings/nm-secret-agent.h
View file

@ -47,7 +47,7 @@ typedef struct {
GType nm_secret_agent_get_type (void);
NMSecretAgent *nm_secret_agent_new (NMDBusManager *dbus_mgr,
NMSecretAgent *nm_secret_agent_new (DBusGMethodInvocation *context,
const char *owner,
const char *identifier,
uid_t owner_uid);