aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-16 21:35:50 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-16 21:35:50 +0000
commit38af2c810e07535dfeb86e883b24a15e5036eeec (patch)
treebb1efd07eb81000f1dac24f18127d3f520154614 /configs
parentc919cd9fc5f30557b69ce18dfb53a8678570b199 (diff)
Merged revisions 206873 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r206873 | dvossel | 2009-07-16 16:33:51 -0500 (Thu, 16 Jul 2009) | 12 lines Merged revisions 206872 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r206872 | dvossel | 2009-07-16 16:33:19 -0500 (Thu, 16 Jul 2009) | 6 lines error in iax.conf related IP-based access control (closes issue #15518) Reported by: pkempgen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@206876 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/iax.conf.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 854a243e2..0ad156ad1 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -334,7 +334,7 @@ inkeys=freeworlddialup
;
; Further user sections may be added, specifying a context and a secret used
; for connections with that given authentication name. Limited IP based
-; access control is allowed by use of "allow" and "deny" keywords. Multiple
+; access control is allowed by use of "permit" and "deny" keywords. Multiple
; rules are permitted. Multiple permitted contexts may be specified, in
; which case the first will be the default. You can also override caller*ID
; so that when you receive a call you set the Caller*ID to be what you want