diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-04-01 10:56:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-04-01 10:56:15 +0100 |
| commit | 7b70aab367ccafb82a8b62892df290415b8e18af (patch) | |
| tree | 572a83a822ab024d9a483943204853d31c4e8757 /net/Socket.cpp | |
| parent | Fix path (again) (diff) | |
| download | online-7b70aab367ccafb82a8b62892df290415b8e18af.tar.gz online-7b70aab367ccafb82a8b62892df290415b8e18af.zip | |
peercred: fixup compile issues.
Change-Id: I87d956f5754e7b353776c538b7bb9dfea7f62883
Diffstat (limited to 'net/Socket.cpp')
| -rw-r--r-- | net/Socket.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/Socket.cpp b/net/Socket.cpp index 441128f16f..f4fb12c2b7 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -570,16 +570,16 @@ std::shared_ptr<Socket> LocalServerSocket::accept() // Sanity check this incoming socket struct ucred creds; socklen_t credSize = sizeof(struct ucred); - if (getsockopt(GetFD(), SOL_SOCKET, SO_PEERCRED, &creds, &credSize) < 0) + if (getsockopt(getFD(), SOL_SOCKET, SO_PEERCRED, &creds, &credSize) < 0) { - LOG_ERR("Failed to get peer creds on " << GetFD() << " " << strerror(errno)); + LOG_ERR("Failed to get peer creds on " << getFD() << " " << strerror(errno)); ::close(rc); return std::shared_ptr<Socket>(nullptr); } - int uid = getuid(); - int gid = getgid(); - if (creds.uid != uid || cred.gid != gid) + uid_t uid = getuid(); + uid_t gid = getgid(); + if (creds.uid != uid || creds.gid != gid) { LOG_ERR("Peercred mis-match on domain socket - closing connection. uid: " << creds.uid << "vs." << uid << " gid: " << creds.gid << "vs." << gid); @@ -590,7 +590,6 @@ std::shared_ptr<Socket> LocalServerSocket::accept() addr.append(std::to_string(creds.pid)); _socket->setClientAddress(addr); - std::shared_ptr<Socket> _socket = _sockFactory->create(rc); LOG_DBG("Accepted socket is UDS - address " << addr << " and pid/gid " << creds.pid << "/" << creds.gid); return _socket; |