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 /apps/app_nbscat.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 'apps/app_nbscat.c')
| -rw-r--r-- | apps/app_nbscat.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index 4e7203319..4b0a03eb1 100644 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -25,6 +25,10 @@ * \ingroup applications */ +/*** MODULEINFO + <depend>working_fork</depend> + ***/ + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -33,6 +37,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/time.h> #include <sys/socket.h> #include <signal.h> +#ifdef HAVE_CAP +#include <sys/capability.h> +#endif /* HAVE_CAP */ #include "asterisk/lock.h" #include "asterisk/file.h" @@ -63,6 +70,9 @@ static int NBScatplay(int fd) int res; int x; sigset_t fullset, oldset; +#ifdef HAVE_CAP + cap_t cap; +#endif sigfillset(&fullset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset); @@ -77,6 +87,15 @@ static int NBScatplay(int fd) signal(SIGPIPE, SIG_DFL); pthread_sigmask(SIG_UNBLOCK, &fullset, NULL); +#ifdef HAVE_CAP + 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 if (ast_opt_high_priority) ast_set_priority(0); |