diff options
| author | Tor Lillqvist <tml@iki.fi> | 2009-04-22 09:42:01 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2009-11-30 12:21:27 +0100 |
| commit | 8c5456c337c65d43f0a2bc1be14beb6391441239 (patch) | |
| tree | 154fac43106db13ae985a71e0d5fde52971ed541 /dbus/dbus-transport.c | |
| parent | ef86bcedc8ec33b77b710a0e1ff84b4ae2539bc1 (diff) | |
| download | dbus-8c5456c337c65d43f0a2bc1be14beb6391441239.tar.gz | |
dbus/dbus-transport.c: _dbus_credentials_get_windows_sid might return NULL (cherry picked from commit 8d8d5fa1babc8f51f1d1bb95b8116850978c60d9)
Diffstat (limited to 'dbus/dbus-transport.c')
| -rw-r--r-- | dbus/dbus-transport.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index 40a1ce15..d8f34eef 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -660,8 +660,10 @@ 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(auth_identity), - _dbus_credentials_get_windows_sid(our_identity)); + (_dbus_credentials_get_windows_sid(auth_identity) ? + _dbus_credentials_get_windows_sid(auth_identity) : "<null>"), + (_dbus_credentials_get_windows_sid(our_identity) ? + _dbus_credentials_get_windows_sid(our_identity) : "<null>")); else _dbus_verbose ("Client authorized as UID "DBUS_UID_FORMAT " but our UID is "DBUS_UID_FORMAT", disconnecting\n", |