automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9868 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/asterisk.c b/asterisk.c
index cc23c4ff359c3f43e8abd090c938cbe389af8f78..5c8a1bfbad956e6bb02cadeeb9e87240e2e4bef6 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -75,6 +75,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/stat.h>
+#include <sys/prctl.h>
 #include <regex.h>
 
 #if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
@@ -2209,6 +2210,12 @@ int main(int argc, char *argv[])
 
 #endif /* __CYGWIN__ */
 
+       if (geteuid() && ast_opt_dump_core) {
+               if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
+                       ast_log(LOG_WARNING, "Unable to set the process for core dumps after changing to a non-root user. %s\n", strerror(errno));
+               }       
+       }
+
        term_init();
        printf(term_end());
        fflush(stdout);