automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@25321 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/asterisk.c b/asterisk.c
index c62442d09b5ab4c7454b87805c9956c37f015131..334d322df4575b1198c7609c37c0bbcd6334d7df 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -2293,6 +2293,7 @@ int main(int argc, char *argv[])
                        fclose(f);
                } else
                        ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", (char *)ast_config_AST_PID, strerror(errno));
+               ast_mainpid = getpid();
        }
 
        /* Test recursive mutex locking. */