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: https://origsvn.digium.com/svn/asterisk/trunk@102969 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f7ed8a7fcbe760acda786f4b14878b11658072f4..a8c29724ab39d3a200fa875e5a4298bf4c8bafd5 100644 (file)
--- 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! */