diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-31 14:51:51 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-31 14:51:51 +0000 |
| commit | f2e4718bf42f507684949ebf484aa94df42abbbe (patch) | |
| tree | 7f6266a7e45144490b18eb6c71a953e8e0196eb9 /dbus/dbus-server-socket.c | |
| parent | a0f3687d650c8c73134f318820f4978a4ff3e9e2 (diff) | |
| parent | 6528b0973bb09b0b407a5e169fdcc519087cc58d (diff) | |
| download | dbus-f2e4718bf42f507684949ebf484aa94df42abbbe.tar.gz | |
Merge tag 'dbus-1.8.0' into baserock/pedroalvarez/genivibaserock/v1.8.0
dbus-1.8.0
Diffstat (limited to 'dbus/dbus-server-socket.c')
| -rw-r--r-- | dbus/dbus-server-socket.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index ae4b602e..060a919e 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -101,7 +101,7 @@ handle_new_client_fd_and_unlock (DBusServer *server, return TRUE; } - transport = _dbus_transport_new_for_socket (client_fd, &server->guid_hex, FALSE); + transport = _dbus_transport_new_for_socket (client_fd, &server->guid_hex, NULL); if (transport == NULL) { _dbus_close_socket (client_fd, NULL); @@ -478,7 +478,10 @@ _dbus_server_new_for_tcp_socket (const char *host, if (server == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - goto failed_4; + if (noncefile != NULL) + goto failed_4; + else + goto failed_2; } _dbus_string_free (&port_str); |