aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-06 22:10:23 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-06 22:10:23 +0000
commit9d2550101197c9db6b91e7a986841884261839e9 (patch)
treee34c47da18b7eba8d333e537d8a6a5f8ef701f54 /channels
parent10449c510d168ee63ec94a651d11bbc53a7a550c (diff)
Merged revisions 274281 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r274281 | tilghman | 2010-07-06 17:09:23 -0500 (Tue, 06 Jul 2010) | 2 lines Status shows all non-CRC4 lines as "yellow", even if "yellow" was not in the bitfield. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@274282 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_dahdi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2a3ffa93e..40c34db90 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -15034,7 +15034,8 @@ static char *dahdi_show_status(struct ast_cli_entry *e, int cmd, struct ast_cli_
s.lineconfig & DAHDI_CONFIG_AMI ? "AMI" :
"Unk",
s.lineconfig & DAHDI_CONFIG_CRC4 ?
- s.lineconfig & DAHDI_CONFIG_NOTOPEN ? "CRC4/YEL" : "CRC4" : "YEL",
+ s.lineconfig & DAHDI_CONFIG_NOTOPEN ? "CRC4/YEL" : "CRC4" :
+ s.lineconfig & DAHDI_CONFIG_NOTOPEN ? "YEL" : "",
lbostr[s.lbo]
);
}