aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-31 17:48:09 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-31 17:48:09 +0000
commit452541605f942fc55a3f0117612424c043ec11b3 (patch)
tree5a8dadc1dccd63c1142efc048f39f5b95601fcfe
parentbb0f9c82461e83bd164ed267c7851c42e3e5a989 (diff)
Add documentation clarifying when 't' and 'T' can be used.
(closes issue #17021) Reported by: kovzol Tested by: lmadsen, kovzol, davidw, ebroad git-svn-id: http://svn.digium.com/svn/asterisk/trunk@255504 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_dial.c6
-rw-r--r--configs/sip.conf.sample3
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index d6430beba..612efcc64 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -336,11 +336,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</option>
<option name="t">
<para>Allow the called party to transfer the calling party by sending the
- DTMF sequence defined in <filename>features.conf</filename>.</para>
+ DTMF sequence defined in <filename>features.conf</filename>. This setting does not perform policy enforcement on
+ transfers initiated by other methods.</para>
</option>
<option name="T">
<para>Allow the calling party to transfer the called party by sending the
- DTMF sequence defined in <filename>features.conf</filename>.</para>
+ DTMF sequence defined in <filename>features.conf</filename>. This setting does not perform policy enforcement on
+ transfers initiated by other methods.</para>
</option>
<option name="U" argsep="^">
<argument name="x" required="true">
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index ce1a8b697..e2df554a2 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -108,7 +108,8 @@ context=default ; Default context for incoming calls
; instead of the From: field.
allowoverlap=no ; Disable overlap dialing support. (Default is yes)
;allowtransfer=no ; Disable all transfers (unless enabled in peers or users)
- ; Default is enabled
+ ; Default is enabled. The Dial() options 't' and 'T' are not
+ ; related as to whether SIP transfers are allowed or not.
;realm=mydomain.tld ; Realm for digest authentication
; defaults to "asterisk". If you set a system name in
; asterisk.conf, it defaults to that system name