when we receive an IAX2 registration request with both a plaintext secret and an...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30847 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1a91dc759e1fb630460974e2836b1b6c780acc30..ae92d33601b84e5a53d015d73916bd12f91de84e 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5052,16 +5052,6 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
                                destroy_peer(p);
                        return -1;
                }
-       } else if (!ast_strlen_zero(secret) && (p->authmethods & IAX_AUTH_PLAINTEXT)) {
-               /* They've provided a plain text password and we support that */
-               if (strcmp(secret, p->secret)) {
-                       if (authdebug)
-                               ast_log(LOG_NOTICE, "Host %s did not provide proper plaintext password for '%s'\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), p->name);
-                       if (ast_test_flag(p, IAX_TEMPONLY))
-                               destroy_peer(p);
-                       return -1;
-               } else
-                       ast_set_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED);
        } else if (!ast_strlen_zero(md5secret) && (p->authmethods & IAX_AUTH_MD5) && !ast_strlen_zero(iaxs[callno]->challenge)) {
                struct MD5Context md5;
                unsigned char digest[16];
@@ -5088,6 +5078,16 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
                                destroy_peer(p);
                        return -1;
                }
+       } else if (!ast_strlen_zero(secret) && (p->authmethods & IAX_AUTH_PLAINTEXT)) {
+               /* They've provided a plain text password and we support that */
+               if (strcmp(secret, p->secret)) {
+                       if (authdebug)
+                               ast_log(LOG_NOTICE, "Host %s did not provide proper plaintext password for '%s'\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), p->name);
+                       if (ast_test_flag(p, IAX_TEMPONLY))
+                               destroy_peer(p);
+                       return -1;
+               } else
+                       ast_set_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED);
        } else if (!ast_strlen_zero(md5secret) || !ast_strlen_zero(secret)) {
                if (authdebug)
                        ast_log(LOG_NOTICE, "Inappropriate authentication received\n");