diff options
| author | Steffen Kieß <Steffen.Kiess@ipvs.uni-stuttgart.de> | 2020-07-13 18:40:12 +0200 |
|---|---|---|
| committer | Steffen Kieß <Steffen.Kiess@ipvs.uni-stuttgart.de> | 2020-07-13 20:45:20 +0200 |
| commit | 6d880185b1483b4efb3e358815060537d91b0de4 (patch) | |
| tree | 8c669442c04ac693fa18ff570ad45bbaf58b4465 /src/dbus/qdbusmessage.cpp | |
| parent | 2a5ad75ec88d4d3cf2a0903bbfd2ff4a6785dcde (diff) | |
Fix passing QDBusUnixFileDescriptors over peer-to-peer connections
Passing QDBusUnixFileDescriptors over peer-to-peer connections currently
does not work, because QDBusConnectionPrivate::setPeer() does not set
this->capabilities (unlike QDBusConnectionPrivate::setConnection()
which is executed for bus connections).
Keep track of whether the connection already has been authenticated, and
once the connection does get authenticated, update this->capabilities.
Note that sending a message directly after connecting (before any
message has been received from the peer) might still fail if the message
contains a QDBusUnixFileDescriptor.
Pick-to: 5.15
Fixes: QTBUG-85396
Change-Id: Ib83213ebcd3255fb091c6faefb3618745b8d736c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusmessage.cpp')
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index 1625dcdfea..01d55280d6 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -282,7 +282,7 @@ QDBusMessage QDBusMessagePrivate::makeLocal(const QDBusConnectionPrivate &conn, // we must marshall and demarshall again so as to create QDBusArgument // entries for the complex types QDBusError error; - DBusMessage *message = toDBusMessage(asSent, conn.capabilities, &error); + DBusMessage *message = toDBusMessage(asSent, conn.connectionCapabilities(), &error); if (!message) { // failed to marshall, so it's a call error return QDBusMessage::createError(error); @@ -290,7 +290,7 @@ QDBusMessage QDBusMessagePrivate::makeLocal(const QDBusConnectionPrivate &conn, q_dbus_message_set_sender(message, conn.baseService.toUtf8()); - QDBusMessage retval = fromDBusMessage(message, conn.capabilities); + QDBusMessage retval = fromDBusMessage(message, conn.connectionCapabilities()); retval.d_ptr->localMessage = true; q_dbus_message_unref(message); if (retval.d_ptr->service.isEmpty()) |