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 /apps/app_dahdiras.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 'apps/app_dahdiras.c')
| -rw-r--r-- | apps/app_dahdiras.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 4ac5daa3d..4ecaaa018 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -27,6 +27,7 @@ /*** MODULEINFO <depend>dahdi</depend> + <depend>working_fork</depend> ***/ #include "asterisk.h" @@ -48,6 +49,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <errno.h> #include <stdio.h> #include <fcntl.h> +#ifdef HAVE_CAP +#include <sys/capability.h> +#endif /* HAVE_CAP */ #include "asterisk/lock.h" #include "asterisk/file.h" @@ -92,6 +96,9 @@ static pid_t spawn_ras(struct ast_channel *chan, char *args) int argc = 0; char *stringp=NULL; sigset_t fullset, oldset; +#ifdef HAVE_CAP + cap_t cap; +#endif sigfillset(&fullset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset); @@ -103,6 +110,16 @@ static pid_t spawn_ras(struct ast_channel *chan, char *args) return pid; } +#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 + /* Restore original signal handlers */ for (x=0;x<NSIG;x++) signal(x, SIG_DFL); |