From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 5 Mar 2011 10:29:30 +0000 (+0000)
Subject: Merged revisions 309677 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4a3720d495ecc4600a97179b0f78748c6def269;p=thirdparty%2Fasterisk.git

Merged revisions 309677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r309677 | tilghman | 2011-03-05 04:28:24 -0600 (Sat, 05 Mar 2011) | 7 lines

  Missed part of the conversion when we started passing ppid to astcanary.

  (closes issue #18850)
   Reported by: viraptor
   Patches:
         canary_ppid.patch uploaded by viraptor (license 543)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@309678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 1b376e33b6..edb3241a62 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3641,7 +3641,7 @@ int main(int argc, char *argv[])
 			ast_copy_string(canary_binary, argv[0], sizeof(canary_binary));
 			if ((lastslash = strrchr(canary_binary, '/'))) {
 				ast_copy_string(lastslash + 1, "astcanary", sizeof(canary_binary) + canary_binary - (lastslash + 1));
-				execl(canary_binary, "astcanary", canary_filename, (char *)NULL);
+				execl(canary_binary, "astcanary", canary_filename, ppid, (char *)NULL);
 			}
 
 			/* Should never happen */