Merge branch 'master' into debian

Include printf for default realm

diff --git a/README b/README
index 885e06e..5785f63 100644 (file)
--- a/README
+++ b/README
@@ -21,24 +21,22 @@ DONE - Resolve TBDs for error handling and deallocation
 
 TO-DO FOR FULL PILOT VERSION (by July 1, 2013)
 ============================
-- Check rp_realm COI membership in TR 
-- Check idp_realm APC membership in TR 
-- Add key confirmation to TID protocol
-- Check gss_name on incoming TID request in TR (in TIDS, too?)
+DONE Check rp_realm COI membership in TR 
+DONE Check idp_realm APC membership in TR 
+DONE Check gss_name on incoming TID request in TR (in TIDS, too?)
 - Add Request ID to TID messages (req'd for mult simultaneous reqs)
-- Fix issue with how DH params are handled in the TR (API clean-up)
 - Handle per-request community configuration in AAA proxy
 - Normalize/configure logging for info, warnings and errors (log4c)
 - Clean-up gsscon API and messages
-- Add accessors for all externally accessible data structures, etc.
-- Formalize API for integration with RADIUS servers
-- Figure out what to do about commented-out checks in gsscon_passive.c
+DONE Add accessors for all externally accessible data structures, etc.
+DONE Formalize API for integration with RADIUS servers
+DONE Figure out what to do about commented-out checks in gsscon_passive.c
 - Handle IPv6 addresses in TID req/resp (use getaddrinfo())
-- Implement rp_permitted filters (incl. general filtering mechanism)
-- Add constraints to TID req in TR, store and use them in AAA Server
+DONE Implement rp_permitted filters (incl. general filtering mechanism)
+DONE Add constraints to TID req in TR, store and use them in AAA Server
 - Use valgrind to check for memory leaks, other issues
 - Resolve remaining TBDs
-- Full functional testing
+DONE Full functional testing
 
 TO-DO FOR PRODUCTION VERSION (expected in August 2013)
 ============================

diff --git a/common/tr_config.c b/common/tr_config.c
index 352c894..ccc8a9d 100644 (file)
--- a/common/tr_config.c
+++ b/common/tr_config.c
@@ -570,7 +570,7 @@ static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg)
                                                  &rc))) {
        return rc;
       }
-      fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured.\n");
+      fprintf(stderr, "tr_cfg_parse_default_servers: Default server configured: %s\n", ds->hostname->buf);
       ds->next = trc->default_servers;
       trc->default_servers = ds;
     }

diff --git a/tid/tidc.c b/tid/tidc.c
index 103d354..649706c 100644 (file)
--- a/tid/tidc.c
+++ b/tid/tidc.c
@@ -74,7 +74,6 @@ int tidc_open_connection (TIDC_INSTANCE *tidc,
   else 
     use_port = port;
 
-  fprintf(stderr, "tidc_open_connection: Opening GSS connection to %s:%u.", server, use_port);  
   err = gsscon_connect(server, use_port, "trustidentity", &conn, gssctx);
 
   if (!err)

diff --git a/trust_router.spec b/trust_router.spec
index a00abe5..8b9cc87 100644 (file)
--- a/trust_router.spec
+++ b/trust_router.spec
@@ -1,7 +1,7 @@
 %global optflags %{optflags} -Wno-parentheses
 Name:           trust_router
-Version:        1.4
-Release:        1%{?dist}
+Version:        1.4.1
+Release:        3%{?dist}
 Summary:        Moonshot Trust Router
 
 Group:          System Environment/Libraries
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group trustrouter > /dev/null || groupadd -r trustrouter
-getent passwd trustrouter > /dev/null || useradd -r -g trustrouter -d /var/lib/trustrouter -s /sbin/nologin -c "GSS-EAP Trust Router service account" trustrouter
+getent passwd trustrouter > /dev/null || useradd -r -g trustrouter -d /var/lib/trust_router -s /sbin/nologin -c "GSS-EAP Trust Router service account" trustrouter
 exit 0