diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-16 23:53:58 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-09-16 23:53:58 +0000 |
| commit | c2c4f86c729294a26ec9138f8f1e5288f89b01e6 (patch) | |
| tree | 1298da607ca8facdbaf23866e9294b57e39057d9 /main/asterisk.c | |
| parent | e887127bf37a123175657e9fbacb5818118800c8 (diff) | |
merge markster's usersconf branch with some slight changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 9cf309872..e5b117baf 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -649,10 +649,14 @@ int ast_safe_system(const char *s) struct rusage rusage; int status; -#if HAVE_WORKING_FORK - ast_replace_sigchld(); +#if defined(HAVE_WORKING_FORK) || defined(HAVE_WORKING_VFORK) + ast_replace_sigchld(); +#ifdef HAVE_WORKING_VFORK + pid = vfork(); +#else pid = fork(); +#endif if (pid == 0) { if (ast_opt_high_priority) |