diff options
| author | Alejandro Colomar <alx.manpages@gmail.com> | 2022-06-19 12:48:01 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx.manpages@gmail.com> | 2022-08-02 13:58:01 +0200 |
| commit | 2c0888f69c247c82fc02ba207aa19fa00acf4b5e (patch) | |
| tree | 9974a31dec090806a18c88c05b5fe6e56f04a137 | |
| parent | 698680d8942feed023cdcfe85e9ca5b67261de2e (diff) | |
| download | unit-2c0888f69c247c82fc02ba207aa19fa00acf4b5e.tar.gz unit-2c0888f69c247c82fc02ba207aa19fa00acf4b5e.tar.bz2 | |
Including <mntent.h> iff it exists.
With NXT_HAVE_PIVOT_ROOT, we had issues in MacOS. Headers should
normally be included unconditionally, except of course if they
don't exist.
This fixes part of the #737 issue on GitHub.
| -rw-r--r-- | auto/isolation | 13 | ||||
| -rw-r--r-- | src/nxt_isolation.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/auto/isolation b/auto/isolation index 4ade6a38..6debdc3b 100644 --- a/auto/isolation +++ b/auto/isolation @@ -73,6 +73,19 @@ nxt_feature_test="#include <sys/syscall.h> . auto/feature +nxt_feature="<mntent.h>" +nxt_feature_name=NXT_HAVE_MNTENT_H +nxt_feature_run=no +nxt_feature_incs= +nxt_feature_libs= +nxt_feature_test="#include <mntent.h> + + int main(void) { + return 0; + }" +. auto/feature + + nxt_feature="prctl(PR_SET_NO_NEW_PRIVS)" nxt_feature_name=NXT_HAVE_PR_SET_NO_NEW_PRIVS0 nxt_feature_run=no diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c index 7bb8dbfd..5a0714ff 100644 --- a/src/nxt_isolation.c +++ b/src/nxt_isolation.c @@ -7,7 +7,7 @@ #include <nxt_process.h> #include <nxt_isolation.h> -#if (NXT_HAVE_PIVOT_ROOT) +#if (NXT_HAVE_MNTENT_H) #include <mntent.h> #endif |