From dd177e398a51394ad47059d6d1f4a5b21699ff36 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Mon, 21 Apr 2008 15:38:28 +0000 Subject: 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 --- apps/app_authenticate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'apps/app_authenticate.c') 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))) { -- cgit v1.2.3