summaryrefslogtreecommitdiff
path: root/asterisk.c
diff options
context:
space:
mode:
authorBJ Weschke <bweschke@btwtech.com>2006-05-07 12:52:08 +0000
committerBJ Weschke <bweschke@btwtech.com>2006-05-07 12:52:08 +0000
commit7e43ace3d85f89031f54e17d8fd243f4aa58b2d7 (patch)
tree9bf52d86a76da5d4cbffd83eff62fa4387a0ddd8 /asterisk.c
parent7abda7787efd465eaf932aac7ee314d502cd131b (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: https://origsvn.digium.com/svn/asterisk/trunk@25289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
-rw-r--r--asterisk.c1
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. */