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, 1 insertions, 0 deletions

diff --git a/include/asterisk/config.h b/include/asterisk/config.h
index 43e1d7480..720d6b971 100644
--- a/include/asterisk/config.h
+++ b/include/asterisk/config.h
@@ -172,6 +172,7 @@ int read_config_maps(void);
 struct ast_config *ast_config_new(void);
 struct ast_category *ast_config_get_current_category(const struct ast_config *cfg);
 void ast_config_set_current_category(struct ast_config *cfg, const struct ast_category *cat);
+char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var);
 
 struct ast_category *ast_category_new(const char *name);
 void ast_category_append(struct ast_config *config, struct ast_category *cat);