[asterisk-commits] lmadsen: trunk r255504 - in /trunk: ./ apps/app_dial.c configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Mar 31 12:48:09 2010
New Revision: 255504

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=255504
Log:
Add documentation clarifying when 't' and 'T' can be used.

(closes issue #17021)
Reported by: kovzol
Tested by: lmadsen, kovzol, davidw, ebroad

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c
    trunk/configs/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=255504&r1=255503&r2=255504
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Mar 31 12:48:09 2010
@@ -336,11 +336,13 @@
 				</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">

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=255504&r1=255503&r2=255504
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Wed Mar 31 12:48:09 2010
@@ -108,7 +108,8 @@
                                 ; 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