diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-27 21:34:04 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-27 21:34:04 +0000 |
| commit | 0a0fba5abe1647eb0384488538133ed3cd5dca77 (patch) | |
| tree | 044ec4b12f7c9c8e1fbcc1c1c79bf85ebf726f81 | |
| parent | b98d7249b74ec65c6afb16c40aefc3699386c0ce (diff) | |
Merged revisions 321330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r321330 | rmudgett | 2011-05-27 16:31:25 -0500 (Fri, 27 May 2011) | 8 lines
The app_privacy args have undocumented "options" position, interferes with "context" position.
* Add documention for unused "options" position to match existing code.
The trunk(v1.10) version will remove the unused options position.
(closes issue #19273)
Reported by: mdavenport
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@321331 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | apps/app_privacy.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -134,6 +134,10 @@ pbx_lua stopped and restarted using the autoservice_stop() and autoservice_start() functions. +PrivacyManager +-------------------------- + * Removed unused options position since there are no more options defined. + ------------------------------------------------------------------------------ --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ---------------- ------------------------------------------------------------------------------ diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 77c3a1f2e..e52f02475 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -92,8 +92,10 @@ static int privacy_exec(struct ast_channel *chan, const char *data) AST_DECLARE_APP_ARGS(args, AST_APP_ARG(maxretries); AST_APP_ARG(minlength); - AST_APP_ARG(options); AST_APP_ARG(checkcontext); + + /* This must be last in the list until we actually have some options again. :) */ + AST_APP_ARG(options); ); if (chan->caller.id.number.valid |