diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-21 15:38:28 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-21 15:38:28 +0000 |
| commit | dd177e398a51394ad47059d6d1f4a5b21699ff36 (patch) | |
| tree | 086de18a281a3e0487995dfd8e8a323cbb8e63f6 /apps/app_authenticate.c | |
| parent | 88d3eb1b41b77821fbf84ee02c2790ceac6d211f (diff) | |
Merged revisions 114327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r114327 | jpeeler | 2008-04-21 10:34:37 -0500 (Mon, 21 Apr 2008) | 2 lines
This removes an invalid warning message for an incorrectly entered pin, but more importantly removes an inapplicable check. If the first argument passed to app_authenticate does not contain a '/', the argument should be treated as the sole fixed "password" to match against and that is all. (Previous behavior was attempting to open a file based on the pin.)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114328 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_authenticate.c')
| -rw-r--r-- | apps/app_authenticate.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 48574a477..8e1919594 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -126,9 +126,7 @@ static int auth_exec(struct ast_channel *chan, void *data) /* Compare against a fixed password */ if (!strcmp(passwd, arglist.password)) break; - } - - if (ast_test_flag(&flags,OPT_DATABASE)) { + } else if (ast_test_flag(&flags,OPT_DATABASE)) { char tmp[256]; /* Compare against a database key */ if (!ast_db_get(arglist.password + 1, passwd, tmp, sizeof(tmp))) { |