From cf60b5b74f03317ca4e17bea2844bf72352eda6d Mon Sep 17 00:00:00 2001
From: lazedo <luis.azedo@factorlusitano.com>
Date: Tue, 9 Dec 2014 01:45:55 +0000
Subject: [PATCH] fix expires

---
 kamailio/registrar-role.cfg | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
index 4cb2c41..fff5fab 100644
--- a/kamailio/registrar-role.cfg
+++ b/kamailio/registrar-role.cfg
@@ -107,13 +107,14 @@ route[ATTEMPT_AUTHORIZATION]
     consume_credentials();
     save("location");
 
-    $var(expires) = @contact.expires;
-    if($var(expires) == $null) {
-        $var(expires) = $hdr(Expires);
-    }
-
-    if($var(expires) == $null) {
-        $var(expires) = REGISTRAR_MIN_EXPIRES;
+    if(@contact.expires) {
+        $var(expires) = @contact.expires;
+    } else { 
+        if($hdr(Expires)) {
+           $var(expires) = $hdr(Expires);
+        } else {
+           $var(expires) = REGISTRAR_MIN_EXPIRES;
+        }
     }
 
     if($var(expires) == 0) {