summaryrefslogtreecommitdiffstats
path: root/action.cpp
diff options
context:
space:
mode:
authorAndreas Eversberg2011-07-14 14:25:42 +0200
committerAndreas Eversberg2011-07-14 14:25:42 +0200
commitda91d7d85fe092122e35ece52695f98345738359 (patch)
treea06ffff8291b8f61441ef75b28a4184824806af5 /action.cpp
parent[GSM_BS] Added DTMF support. (diff)
parent[GSM] Replaced strcpy by required macro name. (diff)
downloadlcr-da91d7d85fe092122e35ece52695f98345738359.tar.gz
lcr-da91d7d85fe092122e35ece52695f98345738359.tar.xz
lcr-da91d7d85fe092122e35ece52695f98345738359.zip
Merge branch 'develop'
Conflicts: Makefile.in README chan_lcr.c configure gsm_bs.cpp gsm_ms.cpp interface.c route.c
Diffstat (limited to 'action.cpp')
-rw-r--r--action.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/action.cpp b/action.cpp
index b7dfc58..352efb4 100644
--- a/action.cpp
+++ b/action.cpp
@@ -1976,9 +1976,11 @@ void EndpointAppPBX::action_execute(void)
end_trace();
return;
}
+#if 0
argv[i++] = (char *)"/bin/sh";
argv[i++] = (char *)"-c";
argv[i++] = command;
+#endif
argv[i++] = command;
if ((rparam = routeparam(e_action, PARAM_PARAM))) {
argv[i++] = rparam->string_value;
@@ -1999,7 +2001,7 @@ void EndpointAppPBX::action_execute(void)
case 0:
/* To be shure there are no zombies created double fork */
if ((pid2 = fork()) == 0) {
- execve("/bin/sh", argv, environ);
+ execve(command, argv, environ);
}
else {
/* Exit immediately and release the waiting parent. The subprocess falls to init because the parent died */