Skip to content

Fix libpsl-native to build and pass tests on FreeBSD #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2019
Merged

Fix libpsl-native to build and pass tests on FreeBSD #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f83337
Fix FreeBSD libpsl tests
mateusrodrigues Jul 2, 2018
4b838af
cleaned PR
mateusrodrigues Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/libpsl-native/src/getuserfrompid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#include <sys/sysctl.h>
#endif

#if __FreeBSD__
#include <sys/user.h>
#endif

char* GetUserFromPid(pid_t pid)
{

Expand All @@ -28,7 +32,7 @@ char* GetUserFromPid(pid_t pid)

return GetFileOwner(path.c_str());

#elif defined(__APPLE__) && defined(__MACH__)
#elif (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__)

// Get effective owner of pid from sysctl
struct kinfo_proc oldp;
Expand All @@ -43,7 +47,11 @@ char* GetUserFromPid(pid_t pid)
return NULL;
}

#if defined(__FreeBSD__)
return GetPwUid(oldp.ki_uid);
#else
return GetPwUid(oldp.kp_eproc.e_ucred.cr_uid);
#endif

#else

Expand Down