Portability fixes for FreeBSD #7869
Conversation
|
Can you please add some documentation for the |
|
Hope it makes it clearer. |
|
Yes, this PR is not enough to make SSSD compile on FreeBSD. I was planning to add more changes once this PR gets accepted. Or I can just continue adding commits to this PR, if you're open to merging it once it is ready. |
|
One PR per "topic" makes sense (like 'ucred vs xcred', for example). I mean, we can merge "complete" (for a given "topic") PR if it looks good even if a whole thing doesn't compile on FreeBSD yet. |
Use it to fix build of sss_client/common.c on FreeBSD.
|
Let's move libcap related patches to a separate PR. |
arrowd
force-pushed
the
freebsd-port
branch
2 times, most recently
from
26819c1 to
584532b
Compare
src/tests/intg/getsockopt_wrapper.c
Outdated
| @@ -14,6 +14,10 @@ | |||
| #include <fcntl.h> | |||
| #include <unistd.h> | |||
|
|
|||
| #if !defined(SO_PEERCRED) && defined(LOCAL_PEERCRED) | |||
| #define SO_PEERCRED LOCAL_PEERCRED | |||
| #endif | |||
There was a problem hiding this comment.
Huh... I just realized that below in this file:
#ifdef __OpenBSD__
struct sockpeercred *cr;
#else
struct ucred *cr;
#endif
If you really want to make this test portable then you need to fix this place also.
(1) I have no idea why this #ifdef __OpenBSD__ was added, I don't know if SSSD code compiles there.
(@sumit-bose, @pbrezina, do you know / remember?)
(2) we are slowly removing intg-tests anyway, so probably you don't want to bother.
There was a problem hiding this comment.
Not sure what exactly to fix there?
There was a problem hiding this comment.
#ifdef __OpenBSD__
struct sockpeercred *cr;
#else
struct ucred *cr;
#endif
won't compile on FreeBSD.
There was a problem hiding this comment.
If you want to fix this, you need to replace it with STRUCT_CRED and then all the code like cr->uid != 0.
But again, probably you can leave this file intact, as it likely will be removed anyway.
There was a problem hiding this comment.
Right, sorry, got a brain glitch. I omitted this change for now.
There was a problem hiding this comment.
Huh... I just realized that below in this file:
#ifdef __OpenBSD__ struct sockpeercred *cr; #else struct ucred *cr; #endifIf you really want to make this test portable then you need to fix this place also.
(1) I have no idea why this
#ifdef __OpenBSD__was added, I don't know if SSSD code compiles there. (@sumit-bose, @pbrezina, do you know / remember?)(2) we are slowly removing intg-tests anyway, so probably you don't want to bother.
Hi,
not sure, but the code might have benn inspired by the original dbus code https://gitlab.freedesktop.org/dbus/dbus/-/blame/main/dbus/dbus-sysdeps-unix.c?ref_type=heads&page=3#L2305 . In general I think that the OpenBSD ifdef is not strictly needed but I'm not sure if there might someone trying to port to OpenBSD as well.
bye,
Sumit
There was a problem hiding this comment.
So, it turns out that OpenBSD has SO_PEERCRED like Linux, but the structure is named differently. It might worth reflecting in util_creds.h, but I'd better leave that to a OpenBSD developer.
src/sss_client/common.c
Outdated
| @@ -45,6 +45,7 @@ | |||
| #define _(STRING) dgettext (PACKAGE, STRING) | |||
| #include "sss_cli.h" | |||
| #include "common_private.h" | |||
| #include "util/util_creds.h" | |||
There was a problem hiding this comment.
(Just some notes, not a "change request")
Maybe makes sense to '#undef HAVE_SELINUX' here to avoid pulling <selinux/*> headers... Not sure.
Or maybe better to split "util_creds.h" into two headers... (out of this PR)
|
Thank you. |
|
Absolutely, I plan to continue submitting patches until the master branch returns to a working state on FreeBSD. |
|
As a side note, what's your plan wrt Linux-specific [files] capabilities used by sssd-2.10+? |
In the short term - try to #ifdef it. The capabilities model of Capsicum is indeed very different from Linux, which makes it hard to properly abstract it. We'll see. |
so that sss_client code doesn't pull selinux headers.
|
@ikerexxe, please take a look at additional patch. |
This PR starts with small steps towards porting the master branch to FreeBSD. I will continue this endeavor if there is a positive feedback on this.