Merged revisions 252088 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r252088 | moy | 2010-03-12 16:57:40 -0500 (Fri, 12 Mar 2010) | 1 line

  add missing mfcr2_skip_category setting
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@252090 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 20287d735fe39c81e0e36564bc430442b0993737..f7338aeff047af46a59ae02eba5b27e8939034dc 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -16885,6 +16885,8 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
                                confp->mfcr2.forced_release = ast_true(v->value) ? 1 : 0;
                        } else if (!strcasecmp(v->name, "mfcr2_immediate_accept")) {
                                confp->mfcr2.immediate_accept = ast_true(v->value) ? 1 : 0;
+                       } else if (!strcasecmp(v->name, "mfcr2_skip_category")) {
+                               confp->mfcr2.skip_category_request = ast_true(v->value) ? 1 : 0;
                        } else if (!strcasecmp(v->name, "mfcr2_call_files")) {
                                confp->mfcr2.call_files = ast_true(v->value) ? 1 : 0;
                        } else if (!strcasecmp(v->name, "mfcr2_max_ani")) {