From bd867271c6b80e5921252b702a0ee6d120955a1f Mon Sep 17 00:00:00 2001
From: Luis Azedo <luis.azedo@factorlusitano.com>
Date: Thu, 24 Sep 2015 19:58:51 +0100
Subject: [PATCH] Revert "Fix only in registrar-role.cfg"

This reverts commit 25daa786567b5ba699aa3e60be405190466e0aae.
---
 kamailio/registrar-role.cfg | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
index ac127b5..a67ea4c 100644
--- a/kamailio/registrar-role.cfg
+++ b/kamailio/registrar-role.cfg
@@ -73,10 +73,8 @@ route[HANDLE_REGISTER]
 
 route[ATTEMPT_AUTHORIZATION]
 {
-    $var(single_contact) = $(ct{s.select,0,,});
-
     $xavp(regcfg=>match_received) = $su;
-    $xavp(regcfg[0]=>match_contact) = $(var(single_contact){nameaddr.uri});
+    $xavp(regcfg[0]=>match_contact) = $(ct{nameaddr.uri});
 
     if ($sht(auth_cache=>$Au) != $null && registered("location", "$rz:$Au", 6) == 1) {
         xlog("L_INFO", "$ci|log|authenticating $fu via cached SIP creds");
@@ -181,9 +179,9 @@ route[ATTEMPT_AUTHORIZATION]
     #}
 
     if ($avp(AVP_RECV_PARAM) == $null) {
-        $var(fs_contact) = "<" + $(var(single_contact){tobody.uri}) + ";" + $var(params) + ">";
+        $var(fs_contact) = "<" + $(ct{tobody.uri}) + ";" + $var(params) + ">";
     } else {
-        $var(fs_contact) = "<sip:" + $(var(single_contact){tobody.user}) + "@" + $si + ":" + $sp + ";transport=" + $var(transport) + ";" + $var(params) + ">";
+        $var(fs_contact) = "<sip:" + $(ct{tobody.user}) + "@" + $si + ":" + $sp + ";transport=" + $var(transport) + ";" + $var(params) + ">";
     }
 
     $var(register_contants) = ' "Presence-Hosts" : "n/a", "Profile-Name" : "sipinterface_1", "Status" : "Registered", "Event-Timestamp" : "' + $TS + '", "Expires" : ' + $var(expires);