Attachment 113372 Details for Bug 89041 – [fix for 3/5] do not try to support SO_PEERSEC on ye olde glibc

[patch] [fix for 3/5] do not try to support SO_PEERSEC on ye olde glibc

0001-fix-for-3-5-do-not-try-to-support-SO_PEERSEC-on-ye-o.patch (text/plain), 1013 bytes, created by Simon McVittie on 2015-02-11 19:06:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-02-11 19:06:34 UTC

Size: 1013 bytes

patch

obsolete

>From f8afa3245c2162a259f6892f0b0f60c8a7dc81de Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 11 Feb 2015 19:04:17 +0000
>Subject: [PATCH 1/2] [fix for 3/5] do not try to support SO_PEERSEC on ye olde
> glibc
>
>---
> dbus/dbus-sysdeps-unix.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index 29d81d5..2184cea 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -1671,15 +1671,11 @@ static dbus_bool_t
> add_linux_security_label_to_credentials (int              client_fd,
>                                          DBusCredentials *credentials)
> {
>-#if defined(__linux__)
>+#if defined(__linux__) && defined(SO_PEERSEC)
>   DBusString buf;
>   socklen_t len = 1024;
>   dbus_bool_t oom = FALSE;
> 
>-#ifndef SO_PEERSEC
>-# define SO_PEERSEC 31
>-#endif
>-
>   if (!_dbus_string_init_preallocated (&buf, len) ||
>       !_dbus_string_set_length (&buf, len))
>     return FALSE;
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89041: 113355 | 113356 | 113357 | 113358 | 113359 | 113372 | 113373 | 113407

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.