From 7bf9f4677452b0a53dcbf3141cae11fc4a2d61a7 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 4 Mar 2008 20:32:55 +0000 Subject: Set username to default to the category name if it isn't overridden by a usernmae= setting in users.conf git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105733 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_phoneprov.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'res') diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index 507238d38..288b236f6 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -705,7 +705,13 @@ static struct user *build_user(struct ast_config *cfg, const char *name, const c for (i = 0; i < PP_VAR_LIST_LENGTH; i++) { tmp = ast_variable_retrieve(cfg, name, pp_variable_list[i].user_var); - if (i == PP_TIMEZONE) { + /* If we didn't get a USERNAME variable, set it to the user->name */ + if (i == PP_USERNAME && !tmp) { + if ((var = ast_var_assign(pp_variable_list[PP_USERNAME].template_var, user->name))) { + AST_LIST_INSERT_TAIL(user->headp, var, entries); + } + continue; + } else if (i == PP_TIMEZONE) { /* perfectly ok if tmp is NULL, will set variables based on server's time zone */ set_timezone_variables(user->headp, tmp); } -- cgit v1.2.3