diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-29 22:54:29 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-29 22:54:29 +0000 |
| commit | 0ff5ae8abf03b712c34e869948652f20dbd858f9 (patch) | |
| tree | bbb253ebe3936896c27af17928c80ed7025d9244 /res/res_agi.c | |
| parent | 2a514c914219bb3e8628021109b509d8087488d4 (diff) | |
Lose the CAP_NET_ADMIN at every fork, instead of at startup. Otherwise, if
Asterisk runs as a non-root user and the administrator does a 'restart now',
Asterisk loses the ability to set QOS on packets.
(closes issue #14004)
Reported by: nemo
Patches:
20090105__bug14004.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@172438 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_agi.c')
| -rw-r--r-- | res/res_agi.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index b39a9a73f..35b29d52f 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -23,6 +23,10 @@ * \author Mark Spencer <markster@digium.com> */ +/*** MODULEINFO + <depend>working_fork</depend> + ***/ + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -44,6 +48,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> #include <errno.h> #include <sys/wait.h> +#ifdef HAVE_CAP +#include <sys/capability.h> +#endif /* HAVE_CAP */ #include "asterisk/file.h" #include "asterisk/logger.h" @@ -308,6 +315,16 @@ static enum agi_result launch_script(char *script, char *argv[], int *fds, int * return AGI_RESULT_FAILURE; } if (!pid) { +#ifdef HAVE_CAP + cap_t cap = cap_from_text("cap_net_admin-eip"); + + if (cap_set_proc(cap)) { + /* Careful with order! Logging cannot happen after we close FDs */ + ast_log(LOG_WARNING, "Unable to remove capabilities.\n"); + } + cap_free(cap); +#endif + /* Pass paths to AGI via environmental variables */ setenv("AST_CONFIG_DIR", ast_config_AST_CONFIG_DIR, 1); setenv("AST_CONFIG_FILE", ast_config_AST_CONFIG_FILE, 1); |