summaryrefslogtreecommitdiffstats
path: root/network/server.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-09-10 01:11:01 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-09-10 01:11:01 +0200
commit14dd201d51b5044160247bd045e7692cfa5efc5b (patch)
treee40ab912fb6310495dd4873bf602ab77695d7766 /network/server.c
parent303db2fca1008b15f3411643ed64a7d612597328 (diff)
parente9e2f58c0c6f8a028068b66362d413357df58f12 (diff)
Merge branch 'devel' of git://git.infradead.org/users/vcgomes/bluez
Diffstat (limited to 'network/server.c')
-rw-r--r--network/server.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/network/server.c b/network/server.c
index e283a994..3230fde6 100644
--- a/network/server.c
+++ b/network/server.c
@@ -338,7 +338,6 @@ static int server_connadd(struct network_server *ns, int nsk,
static void req_auth_cb(DBusError *derr, void *user_data)
{
struct network_server *ns = user_data;
- struct network_adapter *na = ns->na;
uint16_t val;
if (!setup) {
@@ -348,11 +347,7 @@ static void req_auth_cb(DBusError *derr, void *user_data)
if (derr) {
error("Access denied: %s", derr->message);
- if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) {
- bdaddr_t dst;
- str2ba(setup->address, &dst);
- btd_cancel_authorization(&na->src, &dst);
- }
+
val = BNEP_CONN_NOT_ALLOWED;
goto done;
}