From e2d002a1449dc9ef50d4e5b8d5feddaf4e824b7a Mon Sep 17 00:00:00 2001
From: David Vossel <dvossel@digium.com>
Date: Mon, 20 Sep 2010 21:35:46 +0000
Subject: [PATCH] Merged revisions 287645 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287645 | dvossel | 2010-09-20 16:34:15 -0500 (Mon, 20 Sep 2010) | 9 lines

  Fixes issue with registrations not working properly with pedantic=yes.

  (closes issue #18017)
  Reported by: schmidts
  Patches:
        issues_18017_v1.diff uploaded by dvossel (license 671)
  Tested by: schmidts
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287646 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_sip.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index cf9f41b8ab..6b4e281c9d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7260,8 +7260,10 @@ static enum match_req_res match_req_to_dialog(struct sip_pvt *sip_pvt_ptr, struc
 			return SIP_REQ_NOT_MATCH;
 		}
 	} else {
-		/* Verify the fromtag of Request matches the tag they provided earlier. */
-		if (strcmp(arg->fromtag, sip_pvt_ptr->theirtag)) {
+		/* Verify the fromtag of Request matches the tag they provided earlier.
+		 * If this is a Request with authentication credentials, forget their old
+		 * tag as it is not valid after the 401 or 407 response. */
+		if (!arg->authentication_present && strcmp(arg->fromtag, sip_pvt_ptr->theirtag)) {
 			/* their tag does not match the one was have stored for them */
 			return SIP_REQ_NOT_MATCH;
 		}
-- 
GitLab