summaryrefslogtreecommitdiff
path: root/vpn
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2012-12-14 13:01:19 +0200
committerPatrik Flykt <patrik.flykt@linux.intel.com>2012-12-14 16:17:48 +0200
commita31c2d49b6ed819cf77417a262c19bdba5a2a92d (patch)
treed0fb602c4c9fff0fd52d2eb1891d49472958e807 /vpn
parent635e902a6667d6fafd66d5e027d993b8bc31ab55 (diff)
downloadconnman-a31c2d49b6ed819cf77417a262c19bdba5a2a92d.tar.gz
connman-a31c2d49b6ed819cf77417a262c19bdba5a2a92d.tar.bz2
connman-a31c2d49b6ed819cf77417a262c19bdba5a2a92d.zip
vpn-provider: Report disconnect errors other than -EINPROGRESS
Return code -EINPROGRESS is an indication of a disconnect taking place, not a disconnect error.
Diffstat (limited to 'vpn')
-rw-r--r--vpn/vpn-provider.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index e98573fb..4c9fa159 100644
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -457,10 +457,10 @@ static DBusMessage *do_disconnect(DBusConnection *conn, DBusMessage *msg,
DBG("conn %p provider %p", conn, provider);
err = __vpn_provider_disconnect(provider);
- if (err < 0)
+ if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg, -err);
- else
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static const GDBusMethodTable connection_methods[] = {