diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-05 10:30:28 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-03-05 10:30:28 +0000 |
| commit | f56051be4f54b8ab924beec246511f68b7f0cd04 (patch) | |
| tree | d586aafa5cd5111d7f4c53237e45211f2d817c1c | |
| parent | 77bc3aa8e34931ad899c144dd8f570c65da60151 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@309679 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 846848da8..749491515 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 */ |