From 798212c828713fe40e1ded774c0f16fd2e5812b7 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Sat, 5 Mar 2011 10:30:28 +0000 Subject: [PATCH] Merged revisions 309678 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r309678 | tilghman | 2011-03-05 04:29:30 -0600 (Sat, 05 Mar 2011) | 14 lines 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/trunk@309679 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/asterisk.c b/main/asterisk.c index 846848da8f..749491515e 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3646,7 +3646,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 */