dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30563 from poettering/socket-tweaks

Browse Source 
two minor tweak to socket-util.c
This commit is contained in:
Yu Watanabe
2023-12-22 02:30:46 +09:00
committed by GitHub
parent a6076499db fccad70602
commit 6280da4746
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/basic/socket-util.c
View File

@@ -872,13 +872,11 @@ bool address_label_valid(const char *p) {
int getpeercred(int fd, struct ucred *ucred) {
socklen_t n = sizeof(struct ucred);
struct ucred u;
int r;
assert(fd >= 0);
assert(ucred);
r = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &u, &n);
if (r < 0)
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &u, &n) < 0)
return -errno;
if (n != sizeof(struct ucred))
@@ -907,8 +905,10 @@ int getpeersec(int fd, char **ret) {
if (!s)
return -ENOMEM;
if (getsockopt(fd, SOL_SOCKET, SO_PEERSEC, s, &n) >= 0)
if (getsockopt(fd, SOL_SOCKET, SO_PEERSEC, s, &n) >= 0) {
s[n] = 0;
break;
}
if (errno != ERANGE)
return -errno;