diff options
| author | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
| commit | 4aa7912057e83f052e94637f0b1a10026fe14558 (patch) | |
| tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_adsiprog.c | |
| parent | e5afdbbe160b3267df769c9f04c04c6f152b1c94 (diff) | |
Massive cleanups to applications for LOCAL_USER handling and some other things.
In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an
application. An exception is if there is some *fast* setup code that might
halt the execution of the application, such as checking to see if an argument
exists.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_adsiprog.c')
| -rwxr-xr-x | apps/app_adsiprog.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index bf6260bde..8e9d3bf1c 100755 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -1553,9 +1553,12 @@ static int adsi_exec(struct ast_channel *chan, void *data) { int res=0; struct localuser *u; + + LOCAL_USER_ADD(u); + if (!data || ast_strlen_zero(data)) data = "asterisk.adsi"; - LOCAL_USER_ADD(u); + if (!adsi_available(chan)) { if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "ADSI Unavailable on CPE. Not bothering to try.\n"); @@ -1564,7 +1567,9 @@ static int adsi_exec(struct ast_channel *chan, void *data) ast_verbose(VERBOSE_PREFIX_3 "ADSI Available on CPE. Attempting Upload.\n"); res = adsi_prog(chan, data); } + LOCAL_USER_REMOVE(u); + return res; } |