mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 06:10:30 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
49 lines
1.6 KiB
C++
49 lines
1.6 KiB
C++
--- base/posix/unix_domain_socket.cc.orig 2019-03-11 22:00:51 UTC
|
|
+++ base/posix/unix_domain_socket.cc
|
|
@@ -5,7 +5,10 @@
|
|
#include "base/posix/unix_domain_socket.h"
|
|
|
|
#include <errno.h>
|
|
+#include <sys/param.h>
|
|
#include <sys/socket.h>
|
|
+#include <sys/types.h>
|
|
+#include <sys/ucred.h>
|
|
#if !defined(OS_NACL_NONSFI)
|
|
#include <sys/un.h>
|
|
#endif
|
|
@@ -28,6 +31,14 @@ namespace base {
|
|
|
|
const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
|
|
|
|
+#ifndef SCM_CREDENTIALS
|
|
+# define SCM_CREDENTIALS 0x9001
|
|
+#endif
|
|
+
|
|
+#ifndef SO_PASSCRED
|
|
+# define SO_PASSCRED 0x9002
|
|
+#endif
|
|
+
|
|
#if !defined(OS_NACL_NONSFI)
|
|
bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
|
|
int raw_socks[2];
|
|
@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
|
#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
|
|
// The PNaCl toolchain for Non-SFI binary build and macOS do not support
|
|
// ucred. macOS supports xucred, but this structure is insufficient.
|
|
- + CMSG_SPACE(sizeof(struct ucred))
|
|
+ + CMSG_SPACE(sizeof(struct cmsgcred))
|
|
#endif // OS_NACL_NONSFI or OS_MACOSX
|
|
;
|
|
char control_buffer[kControlBufferSize];
|
|
@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
|
// SCM_CREDENTIALS.
|
|
if (cmsg->cmsg_level == SOL_SOCKET &&
|
|
cmsg->cmsg_type == SCM_CREDENTIALS) {
|
|
- DCHECK_EQ(payload_len, sizeof(struct ucred));
|
|
+ DCHECK_EQ(payload_len, sizeof(struct cmsgcred));
|
|
DCHECK_EQ(pid, -1);
|
|
- pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
|
|
+ pid = getpid();
|
|
}
|
|
#endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
|
|
}
|