From a0af2cff0ec70f504c7723f3d134533d9bc6f435 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 25 Feb 2010 21:22:39 +0000 Subject: Merged revisions 248859 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r248859 | tilghman | 2010-02-25 15:21:05 -0600 (Thu, 25 Feb 2010) | 15 lines Some platforms clear /var/run at boot, which makes connecting a remote console... difficult. Previously, we only created the default /var/run/asterisk directory at install time. While we could create it in the init script, that would not work for those who start asterisk manually from the command line. So the safest thing to do is to create it as part of the Asterisk boot process. This also changes the ownership of the directory, because the pid and ctl files are created after we setuid/setgid. (closes issue #16802) Reported by: Brian Patches: 20100224__issue16802.diff.txt uploaded by tilghman (license 14) Tested by: tzafrir ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@248861 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'main/asterisk.c') diff --git a/main/asterisk.c b/main/asterisk.c index db0d672a8..60f818e09 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3314,6 +3314,12 @@ int main(int argc, char *argv[]) */ signal(SIGCHLD, child_handler); + /* It's common on some platforms to clear /var/run at boot. Create the + * socket file directory before we drop privileges. */ + if (mkdir(ast_config_AST_RUN_DIR, 0755) && errno != EEXIST) { + ast_log(LOG_WARNING, "Unable to create socket file directory. Remote consoles will not be able to connect! (%s)\n", strerror(x)); + } + #ifndef __CYGWIN__ if (isroot) { @@ -3327,6 +3333,9 @@ int main(int argc, char *argv[]) ast_log(LOG_WARNING, "No such group '%s'!\n", rungroup); exit(1); } + if (chown(ast_config_AST_RUN_DIR, -1, gr->gr_gid)) { + ast_log(LOG_WARNING, "Unable to chgrp run directory to %d (%s)\n", (int) gr->gr_gid, rungroup); + } if (setgid(gr->gr_gid)) { ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", (int)gr->gr_gid, rungroup); exit(1); @@ -3349,6 +3358,9 @@ int main(int argc, char *argv[]) ast_log(LOG_WARNING, "No such user '%s'!\n", runuser); exit(1); } + if (chown(ast_config_AST_RUN_DIR, pw->pw_uid, -1)) { + ast_log(LOG_WARNING, "Unable to chown run directory to %d (%s)\n", (int) pw->pw_uid, runuser); + } #ifdef HAVE_CAP if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) { ast_log(LOG_WARNING, "Unable to keep capabilities.\n"); -- cgit v1.2.3