diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 23:53:58 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 23:53:58 +0000 |
| commit | 5c0e56df213e669dd543a5996c77383a17a6ecd2 (patch) | |
| tree | 1298da607ca8facdbaf23866e9294b57e39057d9 /main/asterisk.c | |
| parent | 5b13041e0f380ccdf5ce117653086312c4a3a7be (diff) | |
merge markster's usersconf branch with some slight changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43052 f38db490-d61c-443f-a65b-d21fe96a405b
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) |