config: BUG: Restore ability for non-templ to be used as base objs in config.
authorGeorge Joseph <george.joseph@fairview5.com>
Tue, 4 Nov 2014 20:49:14 +0000 (20:49 +0000)
committerGeorge Joseph <george.joseph@fairview5.com>
Tue, 4 Nov 2014 20:49:14 +0000 (20:49 +0000)
commitbd42a09d7fcaa228d15d8bda74129232cdac4081
tree5ff3248df91128e3c788678f074236fb2a0a4aa6
parent97e1c7f3a9223981ee910bb820bb4c5fe70d18e9
config: BUG: Restore ability for non-templ to be used as base objs in config.

My recent refactor of config.c accidentally removed the capability for an
object to inherit from a non-template object.

This patch restores the capability to inherit from both template and
non-template objects.

Tested-by: George Joseph
Reported-by: Scott Griepentrog
ASTERISK-24487 #close

Review: https://reviewboard.asterisk.org/r/4147/
........

Merged revisions 427227 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 427228 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@427229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/config.c