diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-05-27 22:09:03 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-05-27 22:09:03 +0000 |
| commit | cdee44e9920d8324670e565e047082708d840dee (patch) | |
| tree | 64f4d469397d5e2a704242bb6993edcebf8205a1 /apps/app_privacy.c | |
| parent | 3d48ed613c7bbe475e23866656a83cb3b3d73899 (diff) | |
Merged revisions 321337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
Also revert -r321331 and -r321332.
........
r321337 | rmudgett | 2011-05-27 17:06:43 -0500 (Fri, 27 May 2011) | 7 lines
The app_privacy args have undocumented "options" position, interferes with "context" position.
* Add documention for unused "options" position to match existing code.
(closes issue #19273)
Reported by: mdavenport
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_privacy.c')
| -rw-r--r-- | apps/app_privacy.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_privacy.c b/apps/app_privacy.c index e52f02475..6a6c1a437 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -53,6 +53,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <parameter name="minlength"> <para>Minimum allowable digits in the input callerid number. Defaults to <literal>10</literal>.</para> </parameter> + <parameter name="options"> + <para>Position reserved for options.</para> + </parameter> <parameter name="context"> <para>Context to check the given callerid against patterns.</para> </parameter> @@ -92,10 +95,8 @@ 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(checkcontext); - - /* This must be last in the list until we actually have some options again. :) */ AST_APP_ARG(options); + AST_APP_ARG(checkcontext); ); if (chan->caller.id.number.valid |