Subject: [PATCH] adapter: fix call to get_key_info

This complements commit 85128d40f4788acb0115f09c07b716e741444406 that
changed the "linkkeys" file format. The call to get_key_info must
include only the address string, instead of the new combined
address#type text.
---
src/adapter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adapter.c b/src/adapter.c
index e6b5559..b642e37 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1808,7 +1808,7 @@ static void create_stored_device_from_linkkeys(char *key, char *value,
if (sscanf(key, "%17s#%hhu", address, &bdaddr_type) < 2)
bdaddr_type = BDADDR_BREDR;

- info = get_key_info(key, value);
+ info = get_key_info(address, value);
if (info)
keys->keys = g_slist_append(keys->keys, info);

--
1.7.12.rc2.16.g034161a



2012-08-16 19:00:12

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH] adapter: fix call to get_key_info

Hi Henrique,

On Thu, Aug 16, 2012, Henrique Dante de Almeida wrote:
> This complements commit 85128d40f4788acb0115f09c07b716e741444406 that
> changed the "linkkeys" file format. The call to get_key_info must
> include only the address string, instead of the new combined
> address#type text.
> ---
> src/adapter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied. Thanks.

Johan