Index: dbus/dbus-auth.c =================================================================== RCS file: /cvs/dbus/dbus/dbus/dbus-auth.c,v retrieving revision 1.56 diff -u -r1.56 dbus-auth.c --- dbus/dbus-auth.c 14 Jun 2007 21:15:33 -0000 1.56 +++ dbus/dbus-auth.c 21 Jun 2007 13:33:57 -0000 @@ -1104,6 +1104,7 @@ } else { + _dbus_credentials_authorize_verbose(auth->credentials,auth->desired_identity,"a","b","\n"); _dbus_verbose ("%s: desired identity not found in socket credentials\n", DBUS_AUTH_NAME (auth)); return send_rejected (auth); Index: dbus/dbus-credentials.h =================================================================== RCS file: /cvs/dbus/dbus/dbus/dbus-credentials.h,v retrieving revision 1.2 diff -u -r1.2 dbus-credentials.h --- dbus/dbus-credentials.h 12 Jun 2007 18:36:19 -0000 1.2 +++ dbus/dbus-credentials.h 21 Jun 2007 13:30:43 -0000 @@ -65,7 +65,11 @@ DBusCredentials* _dbus_credentials_copy (DBusCredentials *credentials); dbus_bool_t _dbus_credentials_same_user (DBusCredentials *credentials, DBusCredentials *other_credentials); - +void _dbus_credentials_authorize_verbose (DBusCredentials *credentials, + DBusCredentials *credentials_b, + const char *left, + const char *middle, + const char *right); DBUS_END_DECLS Index: dbus/dbus-sysdeps-win.c =================================================================== RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-win.c,v retrieving revision 1.23 diff -u -r1.23 dbus-sysdeps-win.c --- dbus/dbus-sysdeps-win.c 21 Jun 2007 13:11:10 -0000 1.23 +++ dbus/dbus-sysdeps-win.c 21 Jun 2007 13:31:33 -0000 @@ -4267,6 +4267,20 @@ return retval; } +void +_dbus_credentials_authorize_verbose(DBusCredentials *credentials, + DBusCredentials *credentials_b, + const char *left, const char *middle, const char *right) +{ + _dbus_verbose ("%s %s %s %s %s", + left, + _dbus_credentials_get_windows_sid(credentials), + middle, + _dbus_credentials_get_windows_sid(credentials_b), + right); +} + + /** * Append to the string the identity we would like to have when we * authenticate, on UNIX this is the current process UID and on Index: dbus/dbus-transport.c =================================================================== RCS file: /cvs/dbus/dbus/dbus/dbus-transport.c,v retrieving revision 1.60 diff -u -r1.60 dbus-transport.c --- dbus/dbus-transport.c 18 Jun 2007 19:32:51 -0000 1.60 +++ dbus/dbus-transport.c 21 Jun 2007 13:46:32 -0000 @@ -619,21 +619,38 @@ _dbus_credentials_same_user (our_identity, auth_identity)) { + _dbus_credentials_authorize_verbose( + auth_identity, + our_identity, + "Client authorized as UID", + " matching our UID ", + "\n"); + /* FIXME the verbose spam here is unix-specific */ +/* _dbus_verbose ("Client authorized as UID "DBUS_UID_FORMAT " matching our UID "DBUS_UID_FORMAT"\n", _dbus_credentials_get_unix_uid(auth_identity), _dbus_credentials_get_unix_uid(our_identity)); +*/ /* We have authenticated! */ allow = TRUE; } else { + _dbus_credentials_authorize_verbose( + auth_identity, + our_identity, + "Client authorized as UID ", + " but our UID is ", + ", disconnecting\n"); /* FIXME the verbose spam here is unix-specific */ +/* _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(our_identity)); +*/ _dbus_transport_disconnect (transport); allow = FALSE; }