* [PATCH BlueZ v2] mesh: Fix bug with adding more than one app key
@ 2019-03-11 17:10 Brian Gix
2019-03-11 22:21 ` Gix, Brian
0 siblings, 1 reply; 2+ messages in thread
From: Brian Gix @ 2019-03-11 17:10 UTC (permalink / raw)
To: linux-bluetooth; +Cc: inga.stotland, brian.gix
Fixed problem where if the appKeys array already exists, that new add
key requests were rejected.
---
mesh/mesh-db.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c
index 2dc13cd65..d5d19d52f 100644
--- a/mesh/mesh-db.c
+++ b/mesh/mesh-db.c
@@ -533,8 +533,6 @@ bool mesh_db_app_key_add(json_object *jobj, uint16_t net_idx, uint16_t app_idx,
char buf[5];
json_object_object_get_ex(jobj, "appKeys", &jarray);
- if (jarray)
- return false;
if (jarray)
jentry = get_key_object(jarray, app_idx);
--
2.14.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH BlueZ v2] mesh: Fix bug with adding more than one app key
2019-03-11 17:10 [PATCH BlueZ v2] mesh: Fix bug with adding more than one app key Brian Gix
@ 2019-03-11 22:21 ` Gix, Brian
0 siblings, 0 replies; 2+ messages in thread
From: Gix, Brian @ 2019-03-11 22:21 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Stotland, Inga
Applied
On Mon, 2019-03-11 at 10:10 -0700, Brian Gix wrote:
> Fixed problem where if the appKeys array already exists, that new add
> key requests were rejected.
> ---
> mesh/mesh-db.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c
> index 2dc13cd65..d5d19d52f 100644
> --- a/mesh/mesh-db.c
> +++ b/mesh/mesh-db.c
> @@ -533,8 +533,6 @@ bool mesh_db_app_key_add(json_object *jobj, uint16_t net_idx, uint16_t app_idx,
> char buf[5];
>
> json_object_object_get_ex(jobj, "appKeys", &jarray);
> - if (jarray)
> - return false;
>
> if (jarray)
> jentry = get_key_object(jarray, app_idx);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-11 22:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-11 17:10 [PATCH BlueZ v2] mesh: Fix bug with adding more than one app key Brian Gix
2019-03-11 22:21 ` Gix, Brian
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.