[asterisk-commits] tilghman: trunk r309679 - in /trunk: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Mar  5 04:30:28 2011
New Revision: 309679

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

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c

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

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