aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-16 23:42:12 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-16 23:42:12 +0000
commit5026ab41bd827648f73546b5a2c3830ea89edaea (patch)
treec6a12aa3bd1a9204dc4cccdf08a41ce1bfbb6bee /configs
parent6ade0b7d2a8d280e6cc67f702bb67b22bbe83288 (diff)
Merged revisions 219023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219023 | tilghman | 2009-09-16 18:21:53 -0500 (Wed, 16 Sep 2009) | 8 lines Properly deal with quotes in the arguments of '#exec' includes. (closes issue #15583) Reported by: pkempgen Patches: 20090726__issue15583.diff.txt uploaded by tilghman (license 14) 20090726__issue15583-1.4-4.diff.txt uploaded by pkempgen (license 169) Tested by: pkempgen ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@219061 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/extensions.conf.sample5
1 files changed, 5 insertions, 0 deletions
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index 997c97eb6..0cf8542fc 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -106,6 +106,8 @@ clearglobalvars=no
; that includes contexts within other contexts. The #include command works
; in all asterisk configuration files.
;#include "filename.conf"
+;#include <filename.conf>
+;#include filename.conf
;
; You can execute a program or script that produces config files, and they
; will be inserted where you insert the #exec command. The #exec command
@@ -113,6 +115,9 @@ clearglobalvars=no
; activate them within asterisk.conf with the "execincludes" option. They
; are otherwise considered a security risk.
;#exec /opt/bin/build-extra-contexts.sh
+;#exec /opt/bin/build-extra-contexts.sh --foo="bar"
+;#exec </opt/bin/build-extra-contexts.sh --foo="bar">
+;#exec "/opt/bin/build-extra-contexts.sh --foo=\"bar\""
;
; The "Globals" category contains global variables that can be referenced