Temporarily revert r303288
authorJason Parker <jparker@digium.com>
Fri, 21 Jan 2011 23:11:34 +0000 (23:11 +0000)
committerJason Parker <jparker@digium.com>
Fri, 21 Jan 2011 23:11:34 +0000 (23:11 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303376 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

index 53550e0..4519294 100644 (file)
@@ -17736,8 +17736,6 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *base_conf, struct
        if (ucfg) {
                const char *chans;
 
-               /* Reset conf back to defaults, so values from chan_dahdi.conf don't leak in. */
-               base_conf = dahdi_chan_conf_default();
                process_dahdi(base_conf, "", ast_variable_browse(ucfg, "general"), 1, 0);
 
                for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) {