diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2017-12-18 21:09:39 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2017-12-18 21:09:39 +0300 |
| commit | 0e92c213f51bae95605c19dfee843902e7c8a0ad (patch) | |
| tree | 229a9a69caa876b5f7517df2cf0a4882efdddce0 | |
| parent | 752f66bf7d70fae2bf05fbf5941ff4be52b2b9a5 (diff) | |
| download | nginx-0e92c213f51bae95605c19dfee843902e7c8a0ad.tar.gz nginx-0e92c213f51bae95605c19dfee843902e7c8a0ad.zip | |
Improved the capabilities feature detection.
Previously included file sys/capability.h mentioned in capset(2) man page,
belongs to the libcap-dev package, which may not be installed on some Linux
systems when compiling nginx. This prevented the capabilities feature from
being detected and compiled on that systems.
Now linux/capability.h system header is included instead. Since capset()
declaration is located in sys/capability.h, now capset() syscall is defined
explicitly in code using the SYS_capset constant, similarly to other
Linux-specific features in nginx.
| -rw-r--r-- | auto/os/linux | 5 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_config.h | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/auto/os/linux b/auto/os/linux index e4aa0e549..135280f99 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -174,7 +174,8 @@ ngx_feature_test="if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1) return 1" ngx_feature="capabilities" ngx_feature_name="NGX_HAVE_CAPABILITIES" ngx_feature_run=no -ngx_feature_incs="#include <sys/capability.h>" +ngx_feature_incs="#include <linux/capability.h> + #include <sys/syscall.h>" ngx_feature_path= ngx_feature_libs= ngx_feature_test="struct __user_cap_data_struct data; @@ -184,7 +185,7 @@ ngx_feature_test="struct __user_cap_data_struct data; data.effective = CAP_TO_MASK(CAP_NET_RAW); data.permitted = 0; - (void) capset(&header, &data)" + (void) SYS_capset" . auto/feature diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h index b22ea4378..3036caebf 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -100,7 +100,7 @@ typedef struct iocb ngx_aiocb_t; #if (NGX_HAVE_CAPABILITIES) -#include <sys/capability.h> +#include <linux/capability.h> #endif diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 40654b3a2..9b0e0421e 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -869,7 +869,7 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker) data.effective = CAP_TO_MASK(CAP_NET_RAW); data.permitted = data.effective; - if (capset(&header, &data) == -1) { + if (syscall(SYS_capset, &header, &data) == -1) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, "capset() failed"); /* fatal */ |