diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 23:01:06 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 23:01:06 +0000 |
| commit | 7b689f62ea813ab927582e36d6237a5ddb909ef0 (patch) | |
| tree | 7fb549b283dcd2b17a7a51ef2ba6e2fd7616941a /channels/chan_dahdi.c | |
| parent | 270db02b3b557cbef8090c4269538163fcd05070 (diff) | |
Make sure we still support zapchan in users.conf, in addition to dahdichan.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@180010 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 8ba2d8199..291dc4762 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12087,13 +12087,11 @@ static int setup_dahdi(int reload) cfg = ast_config_load("users.conf"); if (cfg) { char *cat; - const char *chans; process_dahdi(&conf, "", ast_variable_browse(cfg, "general"), 1, 1); for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) { if (!strcasecmp(cat, "general")) continue; - chans = ast_variable_retrieve(cfg, cat, "dahdichan"); - if (!ast_strlen_zero(chans)) { + if (!ast_strlen_zero(ast_variable_retrieve(cfg, cat, "dahdichan")) || !ast_strlen_zero(ast_variable_retrieve(cfg, cat, "zapchan"))) { struct dahdi_chan_conf sect_conf; memcpy(§_conf, &conf, sizeof(sect_conf)); |