summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--channels/chan_dahdi.c2
-rw-r--r--main/channel.c1
2 files changed, 2 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;
diff --git a/main/channel.c b/main/channel.c
index 175f9d19f..00f3f7863 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3429,6 +3429,7 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
case AST_CONTROL_SRCCHANGE:
case AST_CONTROL_CONNECTED_LINE:
case AST_CONTROL_REDIRECTING:
+ case -1:
/* Unimportant */
break;
default: