diff options
| author | Havoc Pennington <hp@pobox.com> | 2010-08-31 11:59:09 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-06 19:30:26 +0200 |
| commit | d365dd8141e709222f3a619d7b04ec4ded6429fd (patch) | |
| tree | 0361007028b0286ec2dd793ae12a2b92156d8172 | |
| parent | 5cbfba737fc4643ad189e3d8cc8bb1dbab4b705e (diff) | |
Change failure of setsockopt SO_REUSEADDR to be a warning, not set an error
It was previously setting an error but then continuing, which is
not allowed since errors can't be "piled up"
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index e4ff6eea..3205bed2 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -980,9 +980,8 @@ _dbus_listen_unix_socket (const char *path, reuseaddr = 1; if (setsockopt (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) { - dbus_set_error (error, _dbus_error_from_errno (errno), - "Failed to set socket option\"%s\": %s", - path, _dbus_strerror (errno)); + _dbus_warn ("Failed to set socket option\"%s\": %s", + path, _dbus_strerror (errno)); } if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) @@ -1335,9 +1334,8 @@ _dbus_listen_tcp_socket (const char *host, reuseaddr = 1; if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1) { - dbus_set_error (error, _dbus_error_from_errno (errno), - "Failed to set socket option \"%s:%s\": %s", - host ? host : "*", port, _dbus_strerror (errno)); + _dbus_warn ("Failed to set socket option \"%s:%s\": %s", + host ? host : "*", port, _dbus_strerror (errno)); } if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0) |