[svn-commits] trunk r25289 - in /trunk: ./ asterisk.c

[svn-commits at lists.digium.com]

Author: bweschke
Date: Sun May  7 07:52:08 2006
New Revision: 25289

URL: http://svn.digium.com/view/asterisk?rev=25289&view=rev
Log:
Merged revisions 25288 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r25288 | bweschke | 2006-05-07 08:48:09 -0400 (Sun, 07 May 2006) | 3 lines

 Reset the value of ast_mainpid if we fork so future remote unix connections display the correct PID. #7098 (tzafrir reporting)


........

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

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

Modified: trunk/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/asterisk.c?rev=25289&r1=25288&r2=25289&view=diff
==============================================================================
--- trunk/asterisk.c (original)
+++ trunk/asterisk.c Sun May  7 07:52:08 2006
@@ -2529,6 +2529,7 @@
 			fclose(f);
 		} else
 			ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
+		ast_mainpid = getpid();
 	}
 
 	/* Test recursive mutex locking. */