[svn-commits] russell: branch 1.6.0 r164624 - in /branches/1.6.0: ./ apps/app_minivm.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec 16 09:01:31 2008
New Revision: 164624

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164624
Log:
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

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_minivm.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_minivm.c?view=diff&rev=164624&r1=164623&r2=164624
==============================================================================
--- branches/1.6.0/apps/app_minivm.c (original)
+++ branches/1.6.0/apps/app_minivm.c Tue Dec 16 09:01:31 2008
@@ -1962,7 +1962,6 @@
 {
 	int argc = 0;
 	char *argv[2];
-	int res = 0;
 	char filename[PATH_MAX];
 	char tmp[PATH_MAX];
 	char *domain;
@@ -2004,8 +2003,10 @@
 		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;
@@ -2016,6 +2017,7 @@
 	} 
 	if (ast_strlen_zero(domain) || ast_strlen_zero(username)) {
 		ast_log(LOG_ERROR, "Need username at domain as argument. Sorry. Argument 0 %s\n", argv[0]);
+		pbx_builtin_setvar_helper(chan, "MINIVM_ACCMESS_STATUS", "FAILED");
 		return -1;
 	}
 
@@ -2053,10 +2055,10 @@
 	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 */