diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-01-29 23:15:40 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-01-29 23:15:40 +0000 |
| commit | 80f91f6ab7642289e1d7f860eb15a0849ff80cd0 (patch) | |
| tree | e5e47345008aed483090ead2611ae090736ae573 /main/app.c | |
| parent | 3b08de23df4f784255d6d14c648c260c8b0ebb9a (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@172441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/main/app.c b/main/app.c index 2c2704483..789425fb7 100644 --- a/main/app.c +++ b/main/app.c @@ -36,6 +36,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/time.h> /* for getrlimit(2) */ #include <sys/resource.h> /* for getrlimit(2) */ #include <stdlib.h> /* for closefrom(3) */ +#ifdef HAVE_CAP +#include <sys/capability.h> +#endif /* HAVE_CAP */ #include "asterisk/paths.h" /* use ast_config_AST_DATA_DIR */ #include "asterisk/channel.h" @@ -1883,6 +1886,14 @@ int ast_safe_fork(int stop_reaper) return pid; } else { /* Child */ +#ifdef HAVE_CAP + cap_t cap = cap_from_text("cap_net_admin-eip"); + + if (cap_set_proc(cap)) { + ast_log(LOG_WARNING, "Unable to remove capabilities.\n"); + } + cap_free(cap); +#endif /* Before we unblock our signals, return our trapped signals back to the defaults */ signal(SIGHUP, SIG_DFL); |