Merge branch 'master' into debian

Pull in expiration fix

diff --git a/configure.ac b/configure.ac
index 77d0f70..f7c9011 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([trust_router],[1.5]trus       ,
+AC_INIT([trust_router],[1.5],
 [bugs@project-moonshot.org])
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_AUX_DIR(build-aux)

diff --git a/tr/tr_main.c b/tr/tr_main.c
index dc18ca0..0459101 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -33,6 +33,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <jansson.h>
 
 #include <tr.h>
@@ -82,6 +83,7 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
   TR_INSTANCE *tr = (TR_INSTANCE *) tr_in;
   int oaction = TR_FILTER_ACTION_REJECT;
   int rc = 0;
+  time_t expiration_interval;
 
   if ((!tids) || (!orig_req) || (!resp) ||  (!tr)) {
     tr_debug("tr_tids_req_handler: Bad parameters");
@@ -186,8 +188,11 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
   /* TBD -- Handle multiple servers */
 
   if (cfg_apc)
-    fwd_req->expiration_interval = cfg_apc->expiration_interval;
-  else fwd_req->expiration_interval = cfg_comm->expiration_interval;
+    expiration_interval = cfg_apc->expiration_interval;
+  else expiration_interval = cfg_comm->expiration_interval;
+  if (fwd_req->expiration_interval)
+    fwd_req->expiration_interval =  (expiration_interval < fwd_req->expiration_interval) ? expiration_interval : fwd_req->expiration_interval;
+  else fwd_req->expiration_interval = expiration_interval;
   /* Create a TID client instance */
   if (NULL == (tidc = tidc_create())) {
     tr_crit("tr_tids_req_hander: Unable to allocate TIDC instance.");

diff --git a/trust_router.spec b/trust_router.spec
index 33371a8..2974e05 100644 (file)
--- a/trust_router.spec
+++ b/trust_router.spec
@@ -1,7 +1,7 @@
 %global optflags %{optflags} -Wno-parentheses
 Name:           trust_router
 Version:        1.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Moonshot Trust Router
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@ URL:            http://www.project-moonshot.org/
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  krb5-devel 
+BuildRequires:  krb5-devel , glib-devel
 BuildRequires: jansson-devel >= 2.4
 BuildRequires: sqlite-devel, openssl-devel, libtalloc-devel
 Requires:       moonshot-gss-eap, sqlite