summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-08-23 15:21:48 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-08-23 15:21:48 +0000
commitf07adb44c00ecc5122bee21907c3bdeed913c8b9 (patch)
tree96e74ce4951fcb5e064c5745735228d507df6277 /apps
parent5473ad640bf6482a44283f1de74f7edbb8f69060 (diff)
fix buglets in new authentication code (issue #4860)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_authenticate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 903e7b411..c9bbdf2ef 100755
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -139,7 +139,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
break;
}
} else {
- if(!strcmp(passwd, buf)) {
+ if (!strcmp(passwd, buf)) {
if (strchr(opts, 'a'))
ast_cdr_setaccount(chan, buf);
break;
@@ -150,7 +150,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
fclose(f);
if (!ast_strlen_zero(buf)) {
if (strchr(opts, 'm')) {
- if (!strcmp(md5passwd, md5secret))
+ if (md5secret && !strcmp(md5passwd, md5secret))
break;
} else {
if (!strcmp(passwd, buf))
@@ -168,7 +168,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
prompt="auth-incorrect";
}
if ((retries < 3) && !res) {
- if (strchr(opts, 'a'))
+ if (strchr(opts, 'a') && !strchr(opts, 'm'))
ast_cdr_setaccount(chan, passwd);
res = ast_streamfile(chan, "auth-thankyou", chan->language);
if (!res)