From: Automerge script <automerge@asterisk.org>
Date: Sun, 7 May 2006 13:05:43 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcdcbf879a993336423bc0a91c9efe3256c01a1c;p=thirdparty%2Fasterisk.git

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 c62442d09b..334d322df4 100644
--- 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. */