diff options
author | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-07 12:52:08 +0000 |
---|---|---|
committer | bweschke <bweschke@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-07 12:52:08 +0000 |
commit | 7c748cc9c7d3145aa05455d2bacc47e07a22b951 (patch) | |
tree | 9bf52d86a76da5d4cbffd83eff62fa4387a0ddd8 /asterisk.c | |
parent | 43ffeb8506b9a38e5258143e57c138d28f27677e (diff) |
Merged revisions 25288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r25288 | bweschke | 2006-05-07 08:48:09 -0400 (Sun, 07 May 2006) | 3 lines
Reset the value of ast_mainpid if we fork so future remote unix connections display the correct PID. #7098 (tzafrir reporting)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25289 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rw-r--r-- | asterisk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/asterisk.c b/asterisk.c index e256d3f07..418ce491b 100644 --- a/asterisk.c +++ b/asterisk.c @@ -2529,6 +2529,7 @@ int main(int argc, char *argv[]) fclose(f); } else ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno)); + ast_mainpid = getpid(); } /* Test recursive mutex locking. */ |