From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 2 Apr 2010 20:20:28 +0000 (+0000)
Subject: Merged revisions 255952 via svnmerge from
X-Git-Tag: 1.6.0.27-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f75ce7bfec5b1afcde4ef756938588ad390666e1;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 5adc7db55c..e11312dd52 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3328,7 +3328,7 @@ int main(int argc, char *argv[])
 				close(fd);
 			}
 			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);