diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon-nm/nm/nm_backend.c | 2 | ||||
| -rw-r--r-- | src/libcharon/daemon.c | 4 | ||||
| -rw-r--r-- | src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c | 3 | ||||
| -rw-r--r-- | src/libstrongswan/utils/capabilities.h | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c index a9ad9bdc9..f36cf1f68 100644 --- a/src/charon-nm/nm/nm_backend.c +++ b/src/charon-nm/nm/nm_backend.c @@ -22,7 +22,9 @@ #include <daemon.h> #include <processing/jobs/callback_job.h> +#ifndef CAP_DAC_OVERRIDE #define CAP_DAC_OVERRIDE 1 +#endif typedef struct nm_backend_t nm_backend_t; diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c index ece5afff9..612796a78 100644 --- a/src/libcharon/daemon.c +++ b/src/libcharon/daemon.c @@ -29,6 +29,10 @@ #include <kernel/kernel_handler.h> #include <processing/jobs/start_action_job.h> +#ifndef CAP_NET_ADMIN +#define CAP_NET_ADMIN 12 +#endif + typedef struct private_daemon_t private_daemon_t; /** diff --git a/src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c b/src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c index c7fd3b05d..df24cfa77 100644 --- a/src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c +++ b/src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c @@ -19,8 +19,9 @@ #include <daemon.h> -/* missing in cababilities.h */ +#ifndef CAP_AUDIT_WRITE #define CAP_AUDIT_WRITE 29 +#endif METHOD(plugin_t, get_name, char*, eap_gtc_plugin_t *this) diff --git a/src/libstrongswan/utils/capabilities.h b/src/libstrongswan/utils/capabilities.h index df29cd3a4..cd23cbf10 100644 --- a/src/libstrongswan/utils/capabilities.h +++ b/src/libstrongswan/utils/capabilities.h @@ -24,7 +24,7 @@ #include <library.h> #ifdef HAVE_SYS_CAPABILITY_H # include <sys/capability.h> -#else +#elif defined(CAPABILITIES_NATIVE) # include <linux/capability.h> #endif |