Allow guid key in dbus addresses

Original patch from William Hua

Fix issue #1018
This commit is contained in:
Emmanuel Fleury
2019-07-01 16:20:53 +02:00
parent 25c9b9bace
commit 6a1512ed65
2 changed files with 9 additions and 3 deletions

View File

@@ -150,7 +150,7 @@ is_valid_unix (const gchar *address_entry,
tmpdir = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "abstract") == 0)
abstract = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,
@@ -224,7 +224,7 @@ is_valid_nonce_tcp (const gchar *address_entry,
family = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "noncefile") == 0)
nonce_file = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,
@@ -305,7 +305,7 @@ is_valid_tcp (const gchar *address_entry,
port = g_hash_table_lookup (key_value_pairs, key);
else if (g_strcmp0 (key, "family") == 0)
family = g_hash_table_lookup (key_value_pairs, key);
else
else if (g_strcmp0 (key, "guid") != 0)
{
g_set_error (error,
G_IO_ERROR,