diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 15:02:14 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-16 15:02:14 +0000 |
commit | 729dc58b13219dfea0845eca0f3ece8f6ac7a39c (patch) | |
tree | 33d797a5fef04f66cbdf33c287c2efe6141618ad /apps/app_minivm.c | |
parent | a15734dc9ea42e1987cf4cfdce36d2fb3f38144c (diff) |
Merged revisions 164623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r164623 | russell | 2008-12-16 09:00:27 -0600 (Tue, 16 Dec 2008) | 5 lines
Set MINIVM_ACCMESS_STATUS in all cases. Also, remove a variable that was not needed.
(closes issue #14081)
Reported by: pkempgen
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@164625 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_minivm.c')
-rw-r--r-- | apps/app_minivm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 6b99ce706..ea2a8978b 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1980,7 +1980,6 @@ static int minivm_accmess_exec(struct ast_channel *chan, void *data) { int argc = 0; char *argv[2]; - int res = 0; char filename[PATH_MAX]; char tmp[PATH_MAX]; char *domain; @@ -2022,8 +2021,10 @@ static int minivm_accmess_exec(struct ast_channel *chan, void *data) error = TRUE; } - if (error) + if (error) { + pbx_builtin_setvar_helper(chan, "MINIVM_ACCMESS_STATUS", "FAILED"); return -1; + } ast_copy_string(tmp, argv[0], sizeof(tmp)); username = tmp; @@ -2034,6 +2035,7 @@ static int minivm_accmess_exec(struct ast_channel *chan, void *data) } if (ast_strlen_zero(domain) || ast_strlen_zero(username)) { ast_log(LOG_ERROR, "Need username@domain as argument. Sorry. Argument 0 %s\n", argv[0]); + pbx_builtin_setvar_helper(chan, "MINIVM_ACCMESS_STATUS", "FAILED"); return -1; } @@ -2071,10 +2073,10 @@ static int minivm_accmess_exec(struct ast_channel *chan, void *data) if(ast_test_flag(vmu, MVM_ALLOCED)) free_user(vmu); + pbx_builtin_setvar_helper(chan, "MINIVM_NOTIFY_STATUS", "SUCCESS"); /* Ok, we're ready to rock and roll. Return to dialplan */ - return res; - + return 0; } /*! \brief Append new mailbox to mailbox list from configuration file */ |