diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-29 23:47:00 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-29 23:47:00 +0000 |
commit | b1aaf7ed30d4a31d4dcbe1387934dfdfa0560a8a (patch) | |
tree | 9ba9725bae9ac826c6f8a9b2a6a3be5709413369 /res/res_agi.c | |
parent | f9ca7af2a42504874b55683451eaf9d83b4936d3 (diff) |
Merged revisions 172441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r172441 | tilghman | 2009-01-29 17:15:40 -0600 (Thu, 29 Jan 2009) | 16 lines
Merged revisions 172438 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r172438 | tilghman | 2009-01-29 16:54:29 -0600 (Thu, 29 Jan 2009) | 9 lines
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.6.0@172503 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 ece9c0bbe..76924d5c4 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$") @@ -33,6 +37,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/wait.h> #include <sys/stat.h> #include <pthread.h> +#ifdef HAVE_CAP +#include <sys/capability.h> +#endif /* HAVE_CAP */ #include "asterisk/paths.h" /* use many ast_config_AST_*_DIR */ #include "asterisk/network.h" @@ -667,6 +674,16 @@ static enum agi_result launch_script(struct ast_channel *chan, char *script, cha 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); |