aboutsummaryrefslogtreecommitdiffstats
path: root/asterisk.c
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-07 13:05:43 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-07 13:05:43 +0000
commit2ff546b4d6cb7c2fbd95f793789ba54eaa9bccf9 (patch)
treed8ea2066e8ca04575801ae3d96d3203f71bd94bb /asterisk.c
parent59705ee9a3f3bbac43fea819e8199ddd488847a3 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@25321 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rw-r--r--asterisk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/asterisk.c b/asterisk.c
index c62442d09..334d322df 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. */