Merged revisions 133169 via svnmerge from
[asterisk/asterisk.git] / main / asterisk.c
index 9cd52ef..21b6497 100644 (file)
@@ -165,6 +165,7 @@ int option_maxfiles;                                /*!< Max number of open file handles (files, sockets) */
 long option_minmemfree;                                /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
 #endif
 char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP";
 long option_minmemfree;                                /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
 #endif
 char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP";
+int dahdi_chan_name_len = 3;
 
 /*! @} */
 
 
 /*! @} */
 
@@ -2794,6 +2795,7 @@ static void ast_readconfig(void)
                } else if (!strcasecmp(v->name, "dahdichanname")) {
                        if (!strcasecmp(v->value, "yes")) {
                                ast_copy_string(dahdi_chan_name, "DAHDI", sizeof(dahdi_chan_name));
                } else if (!strcasecmp(v->name, "dahdichanname")) {
                        if (!strcasecmp(v->value, "yes")) {
                                ast_copy_string(dahdi_chan_name, "DAHDI", sizeof(dahdi_chan_name));
+                               dahdi_chan_name_len = 5;
                        }
                } else if (!strcasecmp(v->name, "entityid")) {
                        struct ast_eid tmp_eid;
                        }
                } else if (!strcasecmp(v->name, "entityid")) {
                        struct ast_eid tmp_eid;