diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-18 18:05:21 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-18 18:05:21 +0000 |
| commit | ded479fda43da9dbe5780d0a2b287b5b1dcac64e (patch) | |
| tree | 4708d9539a264a0cd636ab5f4ee4ed9afb02c10f /dbus/dbus-transport-socket.c | |
| parent | 98f19852078cf03f8b50a93d49d83b85c0dd400b (diff) | |
2007-06-18 Havoc Pennington <hp@redhat.com>
* dbus/dbus-sysdeps-unix.c (_dbus_read_credentials_socket): clean
this up a little bit, to try and understand why telnet'ing to a
server and sending a non-nul byte didn't disconnect immediately;
now it seems that it does disconnect immediately as it should,
though I don't understand what has changed.
Diffstat (limited to 'dbus/dbus-transport-socket.c')
| -rw-r--r-- | dbus/dbus-transport-socket.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 5ef4e8bf..4a713c80 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -361,7 +361,13 @@ exchange_credentials (DBusTransport *transport, if (do_reading && transport->receive_credentials_pending) { - /* FIXME this can fail due to IO error _or_ OOM, broken */ + /* FIXME this can fail due to IO error _or_ OOM, broken + * (somewhat tricky to fix since the OOM error can be set after + * we already read the credentials byte, so basically we need to + * separate reading the byte and storing it in the + * transport->credentials). Does not really matter for now + * because storing in credentials never actually fails on unix. + */ if (_dbus_read_credentials_socket (socket_transport->fd, transport->credentials, &error)) |