[svn-commits] tilghman: trunk r255952 - /trunk/main/asterisk.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Apr  2 15:19:01 2010
New Revision: 255952

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

Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=255952&r1=255951&r2=255952
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Fri Apr  2 15:19:01 2010
@@ -3530,7 +3530,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);