summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2013-08-28 06:07:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-30 18:06:31 +0100
commit2163807010e0400540c7751c71704bd7240d3f51 (patch)
tree4072a738eb67e8e4a4233c380fca9ce8cb84b516
parent4e7e54246bb147d1e3c3d0c426ecaa730c389120 (diff)
downloadpoky-2163807010e0400540c7751c71704bd7240d3f51.tar.gz
bluez4: fix network Connect parameter validation
The incorrect validation prevents connection to the NAP service on another device. (From OE-Core rev: 895a0840e82ddfd05c4441b7f8f358e27e6cb38a) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch30
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.101.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
new file mode 100644
index 0000000000..37f919926e
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Backport
2Signed-off-by: Peter A. Bigot <pab@pabigot.com>
3
4From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
5From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
6Date: Sat, 30 Jun 2012 00:39:05 -0300
7Subject: [PATCH] network: fix network Connect() method parameters
8
9---
10 network/connection.c | 4 +++-
11 1 file changed, 3 insertions(+), 1 deletion(-)
12
13diff --git a/network/connection.c b/network/connection.c
14index 544ec3a..59423a9 100644
15--- a/network/connection.c
16+++ b/network/connection.c
17@@ -554,7 +554,9 @@ static void path_unregister(void *data)
18
19 static const GDBusMethodTable connection_methods[] = {
20 { GDBUS_ASYNC_METHOD("Connect",
21- NULL, NULL, connection_connect) },
22+ GDBUS_ARGS({"uuid", "s"}),
23+ GDBUS_ARGS({"interface", "s"}),
24+ connection_connect) },
25 { GDBUS_METHOD("Disconnect",
26 NULL, NULL, connection_disconnect) },
27 { GDBUS_METHOD("GetProperties",
28--
291.7.9.5
30
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index 7af1305e66..d6c3e261f6 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://bluetooth.conf \
6 file://sbc_mmx.patch \ 6 file://sbc_mmx.patch \
7 file://fix-udev-paths.patch \ 7 file://fix-udev-paths.patch \
8 file://obsolete_automake_macros.patch \ 8 file://obsolete_automake_macros.patch \
9 file://network-fix-network-Connect-method-parameters.patch \
9" 10"
10 11
11SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" 12SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"