Merged revisions 25288 via svnmerge from
authorBJ Weschke <bweschke@btwtech.com>
Sun, 7 May 2006 12:52:08 +0000 (12:52 +0000)
committerBJ Weschke <bweschke@btwtech.com>
Sun, 7 May 2006 12:52:08 +0000 (12:52 +0000)
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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25289 65c4cc65-6c06-0410-ace0-fbb531ad65f3

asterisk.c

index e256d3f..418ce49 100644 (file)
@@ -2529,6 +2529,7 @@ int main(int argc, char *argv[])
                        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. */