diff options
| author | Russell Bryant <russell@russellbryant.com> | 2010-07-27 16:08:10 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2010-07-27 16:08:10 +0000 |
| commit | 8bd241f2382979e65f127775e133b7707739a1f2 (patch) | |
| tree | 5ad66c7a9716e2647816434931f26a9f8dd5a542 /channels | |
| parent | 805082efd4c9c3e528b28f118978a3c83c562dcc (diff) | |
Merged revisions 279636,279815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r279636 | russell | 2010-07-26 16:53:30 -0500 (Mon, 26 Jul 2010) | 2 lines
Ignore a control subclass of -1 in ast_waitfordigit_full().
........
r279815 | russell | 2010-07-27 11:06:58 -0500 (Tue, 27 Jul 2010) | 4 lines
Support "channels" in addition to "channel" in chan_dahdi.conf.
Review: https://reviewboard.asterisk.org/r/804
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 4c5f081ca..331278ec2 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -16228,7 +16228,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct } /* Create the interface list */ - if (!strcasecmp(v->name, "channel")) { + if (!strcasecmp(v->name, "channel") || !strcasecmp(v->name, "channels")) { if (options & PROC_DAHDI_OPT_NOCHAN) { ast_log(LOG_WARNING, "Channel '%s' ignored.\n", v->value); continue; |