aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-02 20:20:48 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-02 20:20:48 +0000
commit83bf7214a2c8cc2685192147e350372b1608ca8f (patch)
treed04932c3d70107b5b5577b8d1c4371eff3203de7
parent48bd155db1d2ded05df976087cba881d4ffdf643 (diff)
Merged revisions 255952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r255952 | tilghman | 2010-04-02 15:19:01 -0500 (Fri, 02 Apr 2010) | 8 lines Pass the PID of the Asterisk process, not the PID of the canary. (closes issue #17065) Reported by: globalnetinc Patches: astcanary.patch uploaded by makoto (license 38) Tested by: frawd, globalnetinc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@255955 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/asterisk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 99f7e387e..8e20a7f6b 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3510,7 +3510,7 @@ int main(int argc, char *argv[])
ast_close_fds_above_n(0);
ast_set_priority(0);
- snprintf(ppid, sizeof(ppid), "%d", (int) getpid());
+ snprintf(ppid, sizeof(ppid), "%d", (int) ast_mainpid);
execlp("astcanary", "astcanary", canary_filename, ppid, (char *)NULL);