merge markster's usersconf branch with some slight changes

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43052 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 10 insertions, 0 deletions

diff --git a/main/config.c b/main/config.c
index ee3922a2a..6d88aebec 100644
--- a/main/config.c
+++ b/main/config.c
@@ -147,6 +147,16 @@ struct ast_variable *ast_variable_browse(const struct ast_config *config, const
 	return (cat) ? cat->root : NULL;
 }
 
+char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var)
+{
+	char *tmp;
+	tmp = ast_variable_retrieve(cfg, cat, var);
+	if (!tmp)
+		tmp = ast_variable_retrieve(cfg, "general", var);
+	return tmp;
+}
+
+
 char *ast_variable_retrieve(const struct ast_config *config, const char *category, const char *variable)
 {
 	struct ast_variable *v;