diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:49:18 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:49:18 +0000 |
| commit | 02b6d501ac4ec8afa68343fd7eba07c871def467 (patch) | |
| tree | c260b454ee36057daa09da1d6ddef150eb246521 /pbx | |
| parent | 8c653dc5c125614f66b4d353e2187e3e0c4ea215 (diff) | |
Merged revisions 134086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines
remove remaining Zaptel references in various places
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134087 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_config.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index cbed1e020..b63fedd1e 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1602,16 +1602,6 @@ static void pbx_load_users(void) dahdichan = ast_variable_retrieve(cfg, cat, "dahdichan"); if (!dahdichan) dahdichan = ast_variable_retrieve(cfg, "general", "dahdichan"); - if (!dahdichan) { - /* no dahdichan, but look for zapchan too */ - dahdichan = ast_variable_retrieve(cfg, cat, "zapchan"); - if (!dahdichan) { - dahdichan = ast_variable_retrieve(cfg, "general", "zapchan"); - } - if (!ast_strlen_zero(dahdichan)) { - ast_log(LOG_WARNING, "Use of zapchan in users.conf is deprecated. Please update configuration to use dahdichan instead.\n"); - } - } if (!ast_strlen_zero(dahdichan)) { ast_copy_string(dahdicopy, dahdichan, sizeof(dahdicopy)); c = dahdicopy; |