diff --git a/mesh/manager.c b/mesh/manager.c
index 501ec10..6335976 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
void *user_data)
{
struct mesh_node *node = user_data;
- struct mesh_net *net = node_get_net(node);
struct l_dbus_message_iter iter_key;
uint16_t primary;
uint8_t num_ele;
return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
"Bad device key");
- if (mesh_net_is_local_address(net, primary, num_ele))
- return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
- "Cannot overwrite local device key");
-
if (!keyring_put_remote_dev_key(node, primary, num_ele, key))
return dbus_error(msg, MESH_ERROR_FAILED, NULL);
diff --git a/mesh/node.c b/mesh/node.c
index 833377e..af45a61 100644
--- a/mesh/node.c
+++ b/mesh/node.c
} else if (req->type == REQUEST_TYPE_IMPORT) {
struct node_import *import = req->import;
- struct keyring_net_key net_key;
if (!create_node_config(node, node->uuid))
goto fail;
import->net_idx, import->net_key))
goto fail;
- memcpy(net_key.old_key, import->net_key, 16);
- net_key.net_idx = import->net_idx;
- if (import->flags.kr)
- net_key.phase = KEY_REFRESH_PHASE_TWO;
- else
- net_key.phase = KEY_REFRESH_PHASE_NONE;
-
/* Initialize directory for storing keyring info */
init_storage_dir(node);
- if (!keyring_put_remote_dev_key(node, import->unicast,
- num_ele, import->dev_key))
- goto fail;
-
- if (!keyring_put_net_key(node, import->net_idx, &net_key))
- goto fail;
-
} else {
/* Callback for create node request */
struct keyring_net_key net_key;