[asterisk-commits] tilghman: branch 1.8 r309678 - in /branches/1.8: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Mar  5 04:29:30 2011
New Revision: 309678

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309678
Log:
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)
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/main/asterisk.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/asterisk.c?view=diff&rev=309678&r1=309677&r2=309678
==============================================================================
--- branches/1.8/main/asterisk.c (original)
+++ branches/1.8/main/asterisk.c Sat Mar  5 04:29:30 2011
@@ -3641,7 +3641,7 @@
 			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 */