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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@274282 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2a3ffa93ef7268cb2399d2a209652a191caf7e82..40c34db904ba79dcc4b9218fc0f8fe3586dacc26 100644 (file)
--- 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]
                        );
        }