[asterisk-commits] tilghman: branch 1.6.1 r255954 - in /branches/1.6.1: ./ main/asterisk.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Apr  2 15:20:40 2010
New Revision: 255954

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255954
Log:
Merged revisions 255952 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255952 | tilghman | 2010-04-02 15:19:01 -0500 (Fri, 02 Apr 2010) | 8 lines
  
  Pass the PID of the Asterisk process, not the PID of the canary.
  
  (closes issue #17065)
   Reported by: globalnetinc
   Patches: 
         astcanary.patch uploaded by makoto (license 38)
   Tested by: frawd, globalnetinc
........

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/asterisk.c?view=diff&rev=255954&r1=255953&r2=255954
==============================================================================
--- branches/1.6.1/main/asterisk.c (original)
+++ branches/1.6.1/main/asterisk.c Fri Apr  2 15:20:40 2010
@@ -3351,7 +3351,7 @@
 
 			ast_close_fds_above_n(0);
 			ast_set_priority(0);
-			snprintf(ppid, sizeof(ppid), "%d", (int) getpid());
+			snprintf(ppid, sizeof(ppid), "%d", (int) ast_mainpid);
 
 			execlp("astcanary", "astcanary", canary_filename, ppid, (char *)NULL);