Merged revisions 377434 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Sat, 8 Dec 2012 01:19:36 +0000 (01:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Sat, 8 Dec 2012 01:19:36 +0000 (01:19 +0000)
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

contrib/realtime/mysql/sippeers.sql

index 6884ac6..5c58df7 100644 (file)
@@ -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,