Skip to content

Commit 4b838af

Browse files
cleaned PR
1 parent 0f83337 commit 4b838af

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

src/libpsl-native/src/getuserfrompid.cpp

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ char* GetUserFromPid(pid_t pid)
3232

3333
return GetFileOwner(path.c_str());
3434

35-
#elif defined(__APPLE__) && defined(__MACH__)
35+
#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)
3636

3737
// Get effective owner of pid from sysctl
3838
struct kinfo_proc oldp;
@@ -47,23 +47,11 @@ char* GetUserFromPid(pid_t pid)
4747
return NULL;
4848
}
4949

50-
return GetPwUid(oldp.kp_eproc.e_ucred.cr_uid);
51-
52-
#elif defined(__FreeBSD__)
53-
54-
// Get effective owner of pid from sysctl
55-
struct kinfo_proc oldp;
56-
size_t oldlenp = sizeof(oldp);
57-
int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid };
58-
u_int namelen = sizeof(name)/sizeof(int);
59-
60-
int ret = sysctl(name, namelen, &oldp, &oldlenp, NULL, 0);
61-
if (ret != 0 || oldlenp == 0)
62-
{
63-
return NULL;
64-
}
65-
50+
#if defined(__FreeBSD__)
6651
return GetPwUid(oldp.ki_uid);
52+
#else
53+
return GetPwUid(oldp.kp_eproc.e_ucred.cr_uid);
54+
#endif
6755

6856
#else
6957

0 commit comments

Comments
 (0)