summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerge script <automerge@asterisk.org>2012-12-08 01:19:36 +0000
committerAutomerge script <automerge@asterisk.org>2012-12-08 01:19:36 +0000
commit0f7943c48ab5d93bf8cce73b54fc0852ab4404ba (patch)
tree3a2e6872e5d2913fde90ca74979ef9233c80620e
parent4deecdef727cfdbc29870cb88695e27ec4d9ab51 (diff)
Merged revisions 377434 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk ................ r377434 | rmudgett | 2012-12-07 18:30:40 -0600 (Fri, 07 Dec 2012) | 20 lines Fix order of SIP allow/disallow in MySQL contrib script. Using the contrib sippeers.sql script to create the sippeers MySQL table would result in being unable to place calls if you set the disallow value to all. (closes issue ASTERISK-20756) Reported by: Andre Luis Patches: sippeers.patch patch uploaded by Andre Luis ........ Merged revisions 377431 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 377432 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 377433 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--contrib/realtime/mysql/sippeers.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/realtime/mysql/sippeers.sql b/contrib/realtime/mysql/sippeers.sql
index 6884ac6a9..5c58df7ea 100644
--- a/contrib/realtime/mysql/sippeers.sql
+++ b/contrib/realtime/mysql/sippeers.sql
@@ -28,8 +28,8 @@ CREATE TABLE IF NOT EXISTS `sippeers` (
`callgroup` varchar(40) DEFAULT NULL,
`pickupgroup` varchar(40) DEFAULT NULL,
`language` varchar(40) DEFAULT NULL,
- `allow` varchar(40) DEFAULT NULL,
`disallow` varchar(40) DEFAULT NULL,
+ `allow` varchar(40) DEFAULT NULL,
`insecure` varchar(40) DEFAULT NULL,
`trustrpid` enum('yes','no') DEFAULT NULL,
`progressinband` enum('yes','no','never') DEFAULT NULL,