summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch')
-rw-r--r--meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch b/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch
deleted file mode 100644
index 10bc7edfd..000000000
--- a/meta-oe/recipes-core/dbus/dbus/reuseaddr02.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From d365dd8141e709222f3a619d7b04ec4ded6429fd Mon Sep 17 00:00:00 2001
2From: Havoc Pennington <hp@pobox.com>
3Date: Tue, 31 Aug 2010 15:59:09 +0000
4Subject: Change failure of setsockopt SO_REUSEADDR to be a warning, not set an error
5
6It was previously setting an error but then continuing, which is
7not allowed since errors can't be "piled up"
8---
9diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
10index e4ff6ee..3205bed 100644
11--- a/dbus/dbus-sysdeps-unix.c
12+++ b/dbus/dbus-sysdeps-unix.c
13@@ -980,9 +980,8 @@ _dbus_listen_unix_socket (const char *path,
14 reuseaddr = 1;
15 if (setsockopt (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
16 {
17- dbus_set_error (error, _dbus_error_from_errno (errno),
18- "Failed to set socket option\"%s\": %s",
19- path, _dbus_strerror (errno));
20+ _dbus_warn ("Failed to set socket option\"%s\": %s",
21+ path, _dbus_strerror (errno));
22 }
23
24 if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0)
25@@ -1335,9 +1334,8 @@ _dbus_listen_tcp_socket (const char *host,
26 reuseaddr = 1;
27 if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
28 {
29- dbus_set_error (error, _dbus_error_from_errno (errno),
30- "Failed to set socket option \"%s:%s\": %s",
31- host ? host : "*", port, _dbus_strerror (errno));
32+ _dbus_warn ("Failed to set socket option \"%s:%s\": %s",
33+ host ? host : "*", port, _dbus_strerror (errno));
34 }
35
36 if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0)
37--
38cgit v0.8.3-6-g21f6