From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 22 Apr 2009 07:40:35 +0000 (+0200)
Subject: dbus/dbus-transport.c: fix {our,auth}_identity mismatch (cherry picked from commit... 
X-Git-Tag: dbus-1.3.1~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef86bcedc8ec33b77b710a0e1ff84b4ae2539bc1;p=thirdparty%2Fdbus.git

dbus/dbus-transport.c: fix {our,auth}_identity mismatch (cherry picked from commit e15f1cde3b5893357f640e360f64c0a1ae37f93b)
---

diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 3c67621dc..40a1ce15c 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -660,12 +660,12 @@ auth_via_default_rules (DBusTransport *transport)
       if (_dbus_credentials_include(our_identity,DBUS_CREDENTIAL_WINDOWS_SID))
           _dbus_verbose ("Client authorized as SID '%s'"
                          " but our SID is '%s', disconnecting\n",
-                         _dbus_credentials_get_windows_sid(our_identity),
+                         _dbus_credentials_get_windows_sid(auth_identity),
                          _dbus_credentials_get_windows_sid(our_identity));
       else
           _dbus_verbose ("Client authorized as UID "DBUS_UID_FORMAT
                          " but our UID is "DBUS_UID_FORMAT", disconnecting\n",
-                         _dbus_credentials_get_unix_uid(our_identity),
+                         _dbus_credentials_get_unix_uid(auth_identity),
                          _dbus_credentials_get_unix_uid(our_identity));
       _dbus_transport_disconnect (transport);
       allow = FALSE;