summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-11-03 09:53:50 +0100
committerJiří Klimeš <jklimes@redhat.com>2014-11-07 09:32:32 +0100
commitb41cb60b450fcf27f068a35496f577a7f935033a (patch)
tree102f4e732b653e069d4651e920bb7f66a4efbdd9
parent801fc34d6fae4f1431348ba41264f5846b687dd0 (diff)
downloadNetworkManager-b41cb60b450fcf27f068a35496f577a7f935033a.tar.gz
clients: add real property name to NNSecretAgentSimpleSecret
It is necessary to identify secrets uniquely in nmcli.
-rw-r--r--clients/common/nm-secret-agent-simple.c2
-rw-r--r--clients/common/nm-secret-agent-simple.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index d85c0a5cfe..cb1f086016 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -150,6 +150,7 @@ nm_secret_agent_simple_secret_free (NMSecretAgentSimpleSecret *secret)
NMSecretAgentSimpleSecretReal *real = (NMSecretAgentSimpleSecretReal *)secret;
g_free (secret->name);
+ g_free (secret->prop_name);
g_free (secret->value);
g_free (real->property);
g_clear_object (&real->setting);
@@ -167,6 +168,7 @@ nm_secret_agent_simple_secret_new (const char *name,
real = g_slice_new0 (NMSecretAgentSimpleSecretReal);
real->base.name = g_strdup (name);
+ real->base.prop_name = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property);
real->base.password = password;
if (setting) {
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index afac59c49f..7e11d2a5c0 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/clients/common/nm-secret-agent-simple.h
@@ -41,7 +41,7 @@ typedef struct {
} NMSecretAgentSimpleClass;
typedef struct {
- char *name, *value;
+ char *name, *prop_name, *value;
gboolean password;
} NMSecretAgentSimpleSecret;