Set username to default to the category name if it isn't overridden by a usernmae...
authorTerry Wilson <twilson@digium.com>
Tue, 4 Mar 2008 20:32:55 +0000 (20:32 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 4 Mar 2008 20:32:55 +0000 (20:32 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105733 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_phoneprov.c

index 507238d..288b236 100644 (file)
@@ -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);
                }