aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-08 15:09:47 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-08 15:09:47 +0000
commit0f0be1e000e08d1b438f31b7fe6419ebb2323bac (patch)
tree403fb1aa70470e9bfbb553b8df5d8fd8ea9808eb /channels
parent073ab49bb155469293183797fcd31a1badc1a91c (diff)
Merged revisions 102968 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r102968 | file | 2008-02-08 11:08:20 -0400 (Fri, 08 Feb 2008) | 4 lines Make sure the presence of dbsecret is factored into user scoring. (closes issue #11952) Reported by: bbhoss ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@102969 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f7ed8a7fc..a8c29724a 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5546,7 +5546,7 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
user_unref(best);
best = user;
break;
- } else if (ast_strlen_zero(user->secret) && ast_strlen_zero(user->inkeys)) {
+ } else if (ast_strlen_zero(user->secret) && ast_strlen_zero(user->dbsecret) && ast_strlen_zero(user->inkeys)) {
/* No required authentication */
if (user->ha) {
/* There was host authentication and we passed, bonus! */