X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=common%2Ftr_config.c;h=0bdaab6c7c816d03bde616c5d1092e8cf92d96c9;hb=6d1c81903470e97cd18eba15dacfea5fbd307dc3;hp=d101d9b34adb13acc70c94bbac7f36deea00ff29;hpb=f390c4f826773cf7dbf6bbaf821861d5e2681236;p=trust_router.git

diff --git a/common/tr_config.c b/common/tr_config.c
index d101d9b..0bdaab6 100644
--- a/common/tr_config.c
+++ b/common/tr_config.c
@@ -36,524 +36,1579 @@
 #include <string.h>
 #include <jansson.h>
 #include <dirent.h>
+#include <talloc.h>
 
+#include <tr_cfgwatch.h>
+#include <tr_comm.h>
 #include <tr_config.h>
-#include <tr.h>
+#include <tr_gss.h>
+#include <tr_debug.h>
 #include <tr_filter.h>
+#include <trust_router/tr_constraint.h>
+#include <tr_idp.h>
+#include <tr.h>
+#include <trust_router/trp.h>
+
+void tr_print_config (TR_CFG *cfg) {
+  tr_notice("tr_print_config: Logging running trust router configuration.");
+  tr_print_comms(cfg->comms);
+}
+
+void tr_print_comms (TR_COMM *comm_list) {
+  TR_COMM *comm = NULL;
+
+  for (comm = comm_list; NULL != comm; comm = comm->next) {
+    tr_notice("tr_print_config: Community %s:", comm->id->buf);
+
+    tr_notice("tr_print_config:  - Member IdPs:");
+    tr_print_comm_idps(comm->idp_realms);
+
+    tr_notice("tr_print_config:  - Member RPs:");
+    tr_print_comm_rps(comm->rp_realms);
+  }
+}
+
+void tr_print_comm_idps (TR_IDP_REALM *idp_list) {
+  TR_IDP_REALM *idp = NULL;
+  char *s=NULL;
+
+  for (idp = idp_list; NULL != idp; idp = idp->comm_next) {
+    s=tr_idp_realm_to_str(NULL, idp);
+    if (s!=NULL)
+      tr_notice("tr_print_config:    - @%s", s);
+    else
+      tr_notice("tr_print_config: unable to allocate idp output string.");
+  }
+}
 
-void tr_print_config (FILE *stream, TR_CFG *cfg) {
-  fprintf(stream, "tr_print_config: Not yet implemented.\n");
-  return;
+void tr_print_comm_rps(TR_RP_REALM *rp_list) {
+  TR_RP_REALM *rp = NULL;
+
+  for (rp = rp_list; NULL != rp; rp = rp->next) {
+    tr_notice("tr_print_config:    - %s", rp->realm_name->buf);
+  }
+}
+
+TR_CFG *tr_cfg_new(TALLOC_CTX *mem_ctx)
+{
+  return talloc_zero(mem_ctx, TR_CFG);
 }
 
 void tr_cfg_free (TR_CFG *cfg) {
-  /* TBD -- need to deallocate memory as part of dynamic config */
-  return;
+  talloc_free(cfg);
 }
 
-TR_CFG_RC tr_apply_new_config (TR_INSTANCE *tr) {
+TR_CFG_MGR *tr_cfg_mgr_new(TALLOC_CTX *mem_ctx)
+{
+  return talloc_zero(mem_ctx, TR_CFG_MGR);
+}
+
+void tr_cfg_mgr_free (TR_CFG_MGR *cfg_mgr) {
+  talloc_free(cfg_mgr);
+}
 
-  if (!tr)
+TR_CFG_RC tr_apply_new_config (TR_CFG_MGR *cfg_mgr)
+{
+  /* cfg_mgr->active is allowed to be null, but new cannot be */
+  if ((cfg_mgr==NULL) || (cfg_mgr->new==NULL))
     return TR_CFG_BAD_PARAMS;
 
-  if (tr->active_cfg)
-    tr_cfg_free(tr->active_cfg);
+  if (cfg_mgr->active != NULL)
+    tr_cfg_free(cfg_mgr->active);
+
+  cfg_mgr->active = cfg_mgr->new;
+  cfg_mgr->new=NULL; /* only keep a single handle on the new configuration */
+
+  tr_log_threshold(cfg_mgr->active->internal->log_threshold);
+  tr_console_threshold(cfg_mgr->active->internal->console_threshold);
 
-  tr->active_cfg = tr->new_cfg;
   return TR_CFG_SUCCESS;
 }
 
-static TR_CFG_RC tr_cfg_parse_internal (TR_INSTANCE *tr, json_t *jcfg) {
+static TR_CFG_RC tr_cfg_parse_internal(TR_CFG *trc, json_t *jcfg)
+{
   json_t *jint = NULL;
   json_t *jmtd = NULL;
+  json_t *jtidsp = NULL;
+  json_t *jtrpsp = NULL;
   json_t *jhname = NULL;
-
-  if ((!tr) || (!tr->new_cfg) || (!jcfg))
+  json_t *jlog = NULL;
+  json_t *jconthres = NULL;
+  json_t *jlogthres = NULL;
+  json_t *jcfgpoll = NULL;
+  json_t *jcfgsettle = NULL;
+  json_t *jroutesweep = NULL;
+  json_t *jrouteupdate = NULL;
+  json_t *jrouteconnect = NULL;
+
+  if ((!trc) || (!jcfg))
     return TR_CFG_BAD_PARAMS;
 
-  if (NULL == (tr->new_cfg->internal = malloc(sizeof(TR_CFG_INTERNAL))))
-    return TR_CFG_NOMEM;
-
-  memset(tr->new_cfg->internal, 0, sizeof(TR_CFG_INTERNAL));
+  if (NULL == trc->internal) {
+    if (NULL == (trc->internal = talloc_zero(trc, TR_CFG_INTERNAL)))
+      return TR_CFG_NOMEM;
+  }
 
   if (NULL != (jint = json_object_get(jcfg, "tr_internal"))) {
     if (NULL != (jmtd = json_object_get(jint, "max_tree_depth"))) {
       if (json_is_number(jmtd)) {
-	tr->new_cfg->internal->max_tree_depth = json_integer_value(jmtd);
+        trc->internal->max_tree_depth = json_integer_value(jmtd);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, max_tree_depth is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      /* If not configured, use the default */
+      trc->internal->max_tree_depth = TR_DEFAULT_MAX_TREE_DEPTH;
+    }
+    if (NULL != (jtidsp = json_object_get(jint, "tids_port"))) {
+      if (json_is_number(jtidsp)) {
+        trc->internal->tids_port = json_integer_value(jtidsp);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, tids_port is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      /* If not configured, use the default */
+      trc->internal->tids_port = TR_DEFAULT_TIDS_PORT;
+    }
+    if (NULL != (jtrpsp = json_object_get(jint, "trps_port"))) {
+      if (json_is_number(jtrpsp)) {
+        trc->internal->trps_port = json_integer_value(jtrpsp);
       } else {
-	fprintf(stderr,"tr_cfg_parse_internal: Parsing error, max_tree_depth is not a number.\n");
-	return TR_CFG_NOPARSE;
+        tr_debug("tr_cfg_parse_internal: Parsing error, trps_port is not a number.");
+        return TR_CFG_NOPARSE;
       }
     } else {
       /* If not configured, use the default */
-      tr->new_cfg->internal->max_tree_depth = TR_DEFAULT_MAX_TREE_DEPTH;
+      trc->internal->trps_port = TR_DEFAULT_TRPS_PORT;
     }
     if (NULL != (jhname = json_object_get(jint, "hostname"))) {
       if (json_is_string(jhname)) {
-	tr->new_cfg->internal->hostname = json_string_value(jhname);
+        trc->internal->hostname = json_string_value(jhname);
       } else {
-	fprintf(stderr,"tr_cfg_parse_internal: Parsing error, hostname is not a string.\n");
-	return TR_CFG_NOPARSE;
+        tr_debug("tr_cfg_parse_internal: Parsing error, hostname is not a string.");
+        return TR_CFG_NOPARSE;
       }
     }
-    else {
-      fprintf(stderr, "tr_cfg_parse_internal: Parsing error, hostname is not found.\n");
-      return TR_CFG_NOPARSE;
+    if (NULL != (jcfgpoll = json_object_get(jint, "cfg_poll_interval"))) {
+      if (json_is_number(jcfgpoll)) {
+        trc->internal->cfg_poll_interval = json_integer_value(jcfgpoll);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, cfg_poll_interval is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      trc->internal->cfg_poll_interval = TR_CFGWATCH_DEFAULT_POLL;
+    }
+
+    if (NULL != (jcfgsettle = json_object_get(jint, "cfg_settling_time"))) {
+      if (json_is_number(jcfgsettle)) {
+        trc->internal->cfg_settling_time = json_integer_value(jcfgsettle);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, cfg_settling_time is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      trc->internal->cfg_settling_time = TR_CFGWATCH_DEFAULT_SETTLE;
+    }
+
+    if (NULL != (jrouteconnect = json_object_get(jint, "trp_connect_interval"))) {
+      if (json_is_number(jrouteconnect)) {
+        trc->internal->trp_connect_interval = json_integer_value(jrouteconnect);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, trp_connect_interval is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      /* if not configured, use the default */
+      trc->internal->trp_connect_interval=TR_DEFAULT_TRP_CONNECT_INTERVAL;
     }
-  fprintf(stderr, "tr_cfg_parse_internal: Internal config parsed.\n");
+
+    if (NULL != (jroutesweep = json_object_get(jint, "trp_sweep_interval"))) {
+      if (json_is_number(jroutesweep)) {
+        trc->internal->trp_sweep_interval = json_integer_value(jroutesweep);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, trp_sweep_interval is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      /* if not configured, use the default */
+      trc->internal->trp_sweep_interval=TR_DEFAULT_TRP_SWEEP_INTERVAL;
+    }
+
+    if (NULL != (jrouteupdate = json_object_get(jint, "trp_update_interval"))) {
+      if (json_is_number(jrouteupdate)) {
+        trc->internal->trp_update_interval = json_integer_value(jrouteupdate);
+      } else {
+        tr_debug("tr_cfg_parse_internal: Parsing error, trp_update_interval is not a number.");
+        return TR_CFG_NOPARSE;
+      }
+    } else {
+      /* if not configured, use the default */
+      trc->internal->trp_update_interval=TR_DEFAULT_TRP_UPDATE_INTERVAL;
+    }
+
+    if (NULL != (jlog = json_object_get(jint, "logging"))) {
+      if (NULL != (jlogthres = json_object_get(jlog, "log_threshold"))) {
+        if (json_is_string(jlogthres)) {
+          trc->internal->log_threshold = str2sev(json_string_value(jlogthres));
+        } else {
+          tr_debug("tr_cfg_parse_internal: Parsing error, log_threshold is not a string.");
+          return TR_CFG_NOPARSE;
+        }
+      } else {
+        /* If not configured, use the default */
+        trc->internal->log_threshold = TR_DEFAULT_LOG_THRESHOLD;
+      }
+
+      if (NULL != (jconthres = json_object_get(jlog, "console_threshold"))) {
+        if (json_is_string(jconthres)) {
+            trc->internal->console_threshold = str2sev(json_string_value(jconthres));
+        } else {
+          tr_debug("tr_cfg_parse_internal: Parsing error, console_threshold is not a string.");
+          return TR_CFG_NOPARSE;
+        }
+      } else {
+        /* If not configured, use the default */
+        trc->internal->console_threshold = TR_DEFAULT_CONSOLE_THRESHOLD;
+      }
+    } else {
+        /* If not configured, use the default */
+        trc->internal->console_threshold = TR_DEFAULT_CONSOLE_THRESHOLD;
+        trc->internal->log_threshold = TR_DEFAULT_LOG_THRESHOLD;
+    }
+
+    tr_debug("tr_cfg_parse_internal: Internal config parsed.");
+    return TR_CFG_SUCCESS;
+  }
   return TR_CFG_SUCCESS;
+}
+
+static TR_CONSTRAINT *tr_cfg_parse_one_constraint(TALLOC_CTX *mem_ctx, char *ctype, json_t *jc, TR_CFG_RC *rc)
+{
+  TR_CONSTRAINT *cons=NULL;
+  int i=0;
+
+  if ((!ctype) || (!jc) || (!rc) ||
+      (!json_is_array(jc)) ||
+      (0 >= json_array_size(jc)) ||
+      (TR_MAX_CONST_MATCHES < json_array_size(jc)) ||
+      (!json_is_string(json_array_get(jc, 0)))) {
+    tr_err("tr_cfg_parse_one_constraint: config error.");
+    *rc=TR_CFG_NOPARSE;
+    return NULL;
   }
-  else {
-    fprintf(stderr, "tr_cfg_parse_internal: Parsing error, tr_internal configuration section not found.\n");
-    return TR_CFG_NOPARSE;
+
+  if (NULL==(cons=tr_constraint_new(mem_ctx))) {
+    tr_debug("tr_cfg_parse_one_constraint: Out of memory (cons).");
+    *rc=TR_CFG_NOMEM;
+    return NULL;
+  }
+
+  if (NULL==(cons->type=tr_new_name(ctype))) {
+    tr_err("tr_cfg_parse_one_constraint: Out of memory (type).");
+    *rc=TR_CFG_NOMEM;
+    tr_constraint_free(cons);
+    return NULL;
   }
+
+  for (i=0; i < json_array_size(jc); i++) {
+    cons->matches[i]=tr_new_name(json_string_value(json_array_get(jc, i)));
+    if (cons->matches[i]==NULL) {
+      tr_err("tr_cfg_parse_one_constraint: Out of memory (match %d).", i+1);
+      *rc=TR_CFG_NOMEM;
+      tr_constraint_free(cons);
+      return NULL;
+    }
+  }
+
+  return cons;
 }
 
-static TR_CONSTRAINT *tr_cfg_parse_one_constraint (TR_INSTANCE *tr, const char *ctype, json_t *jdc, TR_CFG_RC *rc)
+static TR_FILTER *tr_cfg_parse_one_filter(TALLOC_CTX *mem_ctx, json_t *jfilt, TR_FILTER_TYPE ftype, TR_CFG_RC *rc)
 {
-  if (NULL == (cons = malloc(sizeof(TR_CONSTRAINT)))) {
-    fprintf(stderr, "tr_cfg_parse_one_constraint: Out of memory.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_FILTER *filt=NULL;
+  json_t *jfaction=NULL;
+  json_t *jfspecs=NULL;
+  json_t *jffield=NULL;
+  json_t *jfmatch=NULL;
+  json_t *jrc=NULL;
+  json_t *jdc=NULL;
+  TR_NAME *name=NULL;
+  int i=0, j=0;
+
+  *rc=TR_CFG_ERROR;
+
+  if ((jfilt==NULL) || (rc==NULL)) {
+    tr_err("tr_cfg_parse_one_filter: null argument");
+    *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
   }
+    
+  if (NULL==(filt=tr_filter_new(tmp_ctx))) {
+    tr_err("tr_cfg_parse_one_filter: Out of memory.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+  tr_filter_set_type(filt, ftype);
+
+  /* make sure we have space to represent the filter */
+  if (json_array_size(jfilt) > TR_MAX_FILTER_LINES) {
+    tr_err("tr_cfg_parse_one_filter: Filter has too many lines, maximum of %d.", TR_MAX_FILTER_LINES);
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+
+  /* For each entry in the filter... */
+  for (i=0; i < json_array_size(jfilt); i++) {
+    if ((NULL==(jfaction=json_object_get(json_array_get(jfilt, i), "action"))) ||
+        (!json_is_string(jfaction))) {
+      tr_debug("tr_cfg_parse_one_filter: Error parsing filter action.");
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
+ 
+    if ((NULL==(jfspecs=json_object_get(json_array_get(jfilt, i), "specs"))) ||
+        (!json_is_array(jfspecs)) ||
+        (0==json_array_size(jfspecs))) {
+      tr_debug("tr_cfg_parse_one_filter: Error parsing filter specs.");
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
+  
+    if (TR_MAX_FILTER_SPECS < json_array_size(jfspecs)) {
+      tr_debug("tr_cfg_parse_one_filter: Filter has too many specs, maximimum of %d.", TR_MAX_FILTER_SPECS);
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
+
+    if (NULL==(filt->lines[i]=tr_fline_new(filt))) {
+      tr_debug("tr_cfg_parse_one_filter: Out of memory allocating filter line %d.", i+1);
+      *rc=TR_CFG_NOMEM;
+      goto cleanup;
+    }
+
+    if (!strcmp(json_string_value(jfaction), "accept")) {
+      filt->lines[i]->action=TR_FILTER_ACTION_ACCEPT;
+    }
+    else if (!strcmp(json_string_value(jfaction), "reject")) {
+      filt->lines[i]->action=TR_FILTER_ACTION_REJECT;
+    }
+    else {
+      tr_debug("tr_cfg_parse_one_filter: Error parsing filter action, unknown action' %s'.", json_string_value(jfaction));
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
+
+    if (NULL!=(jrc=json_object_get(json_array_get(jfilt, i), "realm_constraints"))) {
+      if (!json_is_array(jrc)) {
+        tr_err("tr_cfg_parse_one_filter: cannot parse realm_constraints, not an array.");
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      } else if (json_array_size(jrc)>TR_MAX_CONST_MATCHES) {
+        tr_err("tr_cfg_parse_one_filter: realm_constraints has too many entries, maximum of %d.",
+               TR_MAX_CONST_MATCHES);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      } else if (json_array_size(jrc)>0) {
+        /* ok we actually have entries to process */
+        if (NULL==(filt->lines[i]->realm_cons=tr_cfg_parse_one_constraint(filt->lines[i], "realm", jrc, rc))) {
+          tr_debug("tr_cfg_parse_one_filter: Error parsing realm constraint");
+          *rc=TR_CFG_NOPARSE;
+          goto cleanup;
+        }
+      }
+    }
+
+    if (NULL!=(jdc=json_object_get(json_array_get(jfilt, i), "domain_constraints"))) {
+      if (!json_is_array(jdc)) {
+        tr_err("tr_cfg_parse_one_filter: cannot parse domain_constraints, not an array.");
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      } else if (json_array_size(jdc)>TR_MAX_CONST_MATCHES) {
+        tr_err("tr_cfg_parse_one_filter: domain_constraints has too many entries, maximum of %d.",
+               TR_MAX_CONST_MATCHES);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      } else if (json_array_size(jdc)>0) {
+        if (NULL==(filt->lines[i]->domain_cons=tr_cfg_parse_one_constraint(filt->lines[i], "domain", jdc, rc))) {
+          tr_debug("tr_cfg_parse_one_filter: Error parsing domain constraint");
+          *rc=TR_CFG_NOPARSE;
+          goto cleanup;
+        }
+      }
+    }
+
+    /*For each filter spec within the filter line... */
+    for (j=0; j <json_array_size(jfspecs); j++) {
+      if ((NULL==(jffield=json_object_get(json_array_get(jfspecs, j), "field"))) ||
+          (!json_is_string(jffield))) {
+        tr_debug("tr_cfg_parse_one_filter: Error parsing filter: missing field for filer spec %d, filter line %d.", i, j);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
+
+      /* check that we have a match attribute */
+      if (NULL==(jfmatch=json_object_get(json_array_get(jfspecs, j), "match"))) {
+        tr_debug("tr_cfg_parse_one_filter: Error parsing filter: missing match for filer spec %d, filter line %d.", i, j);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
+
+      /* check that match is a string */
+      if (!json_is_string(jfmatch)) {
+        tr_debug("tr_cfg_parse_one_filter: Error parsing filter: match not a string for filter spec %d, filter line %d.", i, j);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
 
-  memset(filt, 0, sizeof(TR_FILTER));
+      /* allocate the filter spec */
+      if (NULL==(filt->lines[i]->specs[j]=tr_fspec_new(filt->lines[i]))) {
+        tr_debug("tr_cfg_parse_one_filter: Out of memory.");
+        *rc=TR_CFG_NOMEM;
+        goto cleanup;
+      }
 
+      /* fill in the field */
+      if (NULL==(filt->lines[i]->specs[j]->field=tr_new_name(json_string_value(jffield)))) {
+        tr_debug("tr_cfg_parse_one_filter: Out of memory.");
+        *rc=TR_CFG_NOMEM;
+        goto cleanup;
+      }
+
+      /* fill in the matches */
+      if (NULL==(name=tr_new_name(json_string_value(jfmatch)))) {
+        tr_debug("tr_cfg_parse_one_filter: Out of memory.");
+        *rc=TR_CFG_NOMEM;
+        goto cleanup;
+      }
+      tr_fspec_set_match(filt->lines[i]->specs[j], name);
+    }
+  }
+  *rc=TR_CFG_SUCCESS;
+  talloc_steal(mem_ctx, filt);
   
+ cleanup:
+  talloc_free(tmp_ctx);
+  if (*rc!=TR_CFG_SUCCESS)
+    filt=NULL;
+  return filt;
 }
 
-static TR_FILTER *tr_cfg_parse_one_filter (TR_INSTANCE *tr, json_t *jfilt, TR_CFG_RC *rc)
+static TR_FILTER *tr_cfg_parse_filters(TALLOC_CTX *mem_ctx, json_t *jfilts, TR_CFG_RC *rc)
 {
-  TR_FILTER *filt = NULL;
-  json_t *jftype = NULL;
-  json_t *jfls = NULL;
-  json_t *jfaction = NULL;
-  json_t *jfspecs = NULL;
-  json_t *jffield = NULL;
-  json_t *jfmatch = NULL;
-  json_t *jrc = NULL;
-  json_t *jdc = NULL;
-  int i = 0, j = 0;
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  json_t *jfilt;
+  TR_FILTER *filt=NULL;
 
-  if ((NULL == (jftype = json_object_get(jfilt, "type"))) ||
-      (!json_is_string(jftype))) {
-    fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing filter type.\n");
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+  *rc=TR_CFG_ERROR;
+
+  /* no filters */
+  if (jfilts==NULL) {
+    *rc=TR_CFG_SUCCESS;
+    goto cleanup;
   }
 
-  if ((NULL == (jfls = json_object_get(jfilt, "filter_lines"))) ||
-      (!json_is_array(jfls))) {
-    fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing filter type.\n");
-    *rc = TR_CFG_NOPARSE;
+  jfilt=json_object_get(jfilts, "tid_inbound");
+  if (jfilt!=NULL) {
+    filt=tr_cfg_parse_one_filter(tmp_ctx, jfilt, TR_FILTER_TYPE_TID_INCOMING, rc);
+    if (*rc!=TR_CFG_SUCCESS) {
+      tr_debug("tr_cfg_parse_filters: Error parsing tid_inbound filter.");
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
+  } else {
+    tr_debug("tr_cfg_parse_filters: Unknown filter types in filter block.");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  
+  *rc=TR_CFG_SUCCESS;
+
+ cleanup:
+  if (*rc==TR_CFG_SUCCESS)
+    talloc_steal(mem_ctx, filt);
+  else if (filt!=NULL) {
+    talloc_free(filt);
+    filt=NULL;
+  }
+
+  talloc_free(tmp_ctx);
+  return filt;
+}
+
+static TR_AAA_SERVER *tr_cfg_parse_one_aaa_server(TALLOC_CTX *mem_ctx, json_t *jaddr, TR_CFG_RC *rc)
+{
+  TR_AAA_SERVER *aaa = NULL;
+  TR_NAME *name=NULL;
+
+  if ((!jaddr) || (!json_is_string(jaddr))) {
+    tr_debug("tr_cfg_parse_one_aaa_server: Bad parameters.");
+    *rc = TR_CFG_BAD_PARAMS;
     return NULL;
   }
 
-  if (TR_MAX_FILTER_LINES < json_array_size(jfls)) {
-    fprintf(stderr, "tr_cfg_parse_one_filter: Filter has too many filter_lines, maximimum of %d.\n", TR_MAX_FILTER_LINES);
-    *rc = TR_CFG_NOPARSE;
+  name=tr_new_name(json_string_value(jaddr));
+  if (name==NULL) {
+    tr_debug("tr_cfg_parse_one_aaa_server: Out of memory allocating hostname.");
+    *rc = TR_CFG_NOMEM;
     return NULL;
   }
 
-  if (NULL == (filt = malloc(sizeof(TR_FILTER)))) {
-    fprintf(stderr, "tr_config_parse_one_filter: Out of memory.\n");
+  aaa=tr_aaa_server_new(mem_ctx, name);
+  if (aaa==NULL) {
+    tr_free_name(name);
+    tr_debug("tr_cfg_parse_one_aaa_server: Out of memory allocating AAA server.");
     *rc = TR_CFG_NOMEM;
     return NULL;
   }
 
-  memset(filt, 0, sizeof(TR_FILTER));
+  return aaa;
+}
+
+static TR_AAA_SERVER *tr_cfg_parse_aaa_servers(TALLOC_CTX *mem_ctx, json_t *jaaas, TR_CFG_RC *rc) 
+{
+  TALLOC_CTX *tmp_ctx=NULL;
+  TR_AAA_SERVER *aaa = NULL;
+  TR_AAA_SERVER *temp_aaa = NULL;
+  int i = 0;
+
+  for (i = 0; i < json_array_size(jaaas); i++) {
+    /* rc gets set in here */
+    if (NULL == (temp_aaa = tr_cfg_parse_one_aaa_server(tmp_ctx, json_array_get(jaaas, i), rc))) {
+      talloc_free(tmp_ctx);
+      return NULL;
+    }
+    /* TBD -- IPv6 addresses */
+    //    tr_debug("tr_cfg_parse_aaa_servers: Configuring AAA Server: ip_addr = %s.", inet_ntoa(temp_aaa->aaa_server_addr));
+    temp_aaa->next = aaa;
+    aaa = temp_aaa;
+  }
+  tr_debug("tr_cfg_parse_aaa_servers: Finished (rc=%d)", *rc);
+
+  for (temp_aaa=aaa; temp_aaa!=NULL; temp_aaa=temp_aaa->next)
+    talloc_steal(mem_ctx, temp_aaa);
+  talloc_free(tmp_ctx);
+  return aaa;
+}
+
+static TR_APC *tr_cfg_parse_one_apc(TALLOC_CTX *mem_ctx, json_t *japc, TR_CFG_RC *rc)
+{
+  TR_APC *apc=NULL;
+  TR_NAME *name=NULL;
+  
+  *rc = TR_CFG_SUCCESS;         /* presume success */
 
-  if (!strcmp(json_string_value(jftype), "rp_permitted")) {
-    filt->type = TR_FILTER_TYPE_RP_PERMITTED;
+  if ((!japc) || (!rc) || (!json_is_string(japc))) {
+    tr_debug("tr_cfg_parse_one_apc: Bad parameters.");
+    if (rc) 
+      *rc = TR_CFG_BAD_PARAMS;
+    return NULL;
   }
-  else {
-    fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing filter type, unknown type '%s'.\n", json_string_value(jftype));
-    *rc = TR_CFG_NOPARSE;
-    tr_filter_free(filt);
+
+  apc=tr_apc_new(mem_ctx);
+  if (apc==NULL) {
+    tr_debug("tr_cfg_parse_one_apc: Out of memory.");
+    *rc = TR_CFG_NOMEM;
+    return NULL;
+  }
+
+  name=tr_new_name(json_string_value(japc));
+  if (name==NULL) {
+    tr_debug("tr_cfg_parse_one_apc: No memory for APC name.");
+    tr_apc_free(apc);
+    *rc = TR_CFG_NOMEM;
     return NULL;
   }
+  tr_apc_set_id(apc, name); /* apc is now responsible for freeing the name */
+
+  return apc;
+}
+
+static TR_APC *tr_cfg_parse_apcs(TALLOC_CTX *mem_ctx, json_t *japcs, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_APC *apcs=NULL;
+  TR_APC *new_apc=NULL;
+  int ii=0;
+  TR_CFG_RC call_rc=TR_CFG_ERROR;
   
-  /* For each filter line... */
-  for (i = 0; i < json_array_size(jfls); i++) {
-
-    if ((NULL == (jfaction = json_object_get(json_array_get(jfls, i), "action"))) ||
-	(!json_is_string(jfaction))) {
-      fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing filter action.\n");
-      *rc = TR_CFG_NOPARSE;
-      tr_filter_free(filt);
-      return NULL;
-    }
- 
-    if ((NULL != (jrc = json_object_get(json_array_get(jfls, i), "realm_constraints"))) &&
-	(json_is_array(jrc)) &&
-	(0 != json_array_size(jrc)) &&
-	(TR_MAX_CONST_MATCHES >= json_array_size(jrc))) {
-      if (NULL == (filt->realm_cons = tr_cfg_parse_one_constraint(tr, "realm", jrc, rc)))
-	fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing realm constraint");
-      tr_filter_free(filt);
-      return NULL;
-    }
+  *rc = TR_CFG_SUCCESS;         /* presume success */
 
-    if ((NULL != (jdc = json_object_get(json_array_get(jfls, i), "domain_constraints"))) &&
-	(json_is_array(jdc)) &&
-	(0 != json_array_size(jdc)) &&
-	(TR_MAX_CONST_MATCHES >= json_array_size(jdc))) {
-      if (NULL == (filt->realm_cons = tr_cfg_parse_one_constraint(tr, "domain", jdc, rc)))
-	fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing domain constraint");
-      tr_filter_free(filt);
-      return NULL;
+  if ((!japcs) || (!rc) || (!json_is_array(japcs))) {
+    tr_debug("tr_cfg_parse_one_apc: Bad parameters.");
+    if (rc) 
+      *rc = TR_CFG_BAD_PARAMS;
+    return NULL;
+  }
+
+  for (ii=0; ii<json_array_size(japcs); ii++) {
+    new_apc=tr_cfg_parse_one_apc(tmp_ctx, json_array_get(japcs, ii), &call_rc);
+    if ((call_rc!=TR_CFG_SUCCESS) || (new_apc==NULL)) {
+      tr_debug("tr_cfg_parse_apcs: Error parsing APC %d.", ii+1);
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
     }
+    apcs=tr_apc_add(apcs, new_apc);
+  }
 
-    if ((NULL == (jfspecs = json_object_get(json_array_get(jfls, i), "filter_specs"))) ||
-	(!json_is_array(jfspecs)) ||
-	(0 == json_array_size(jfspecs))) {
-      fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing filter specs.\n");
-      *rc = TR_CFG_NOPARSE;
-      tr_filter_free(filt);
-      return NULL;
+  talloc_steal(mem_ctx, apcs);
+  *rc=TR_CFG_SUCCESS;
+
+ cleanup:
+  talloc_free(tmp_ctx);
+  return apcs;
+}
+
+static TR_NAME *tr_cfg_parse_name(TALLOC_CTX *mem_ctx, json_t *jname, TR_CFG_RC *rc)
+{
+  TR_NAME *name=NULL;
+  *rc=TR_CFG_ERROR;
+
+  if ((jname==NULL) || (!json_is_string(jname))) {
+    tr_err("tr_cfg_parse_name: name missing or not a string");
+    *rc=TR_CFG_BAD_PARAMS;
+    name=NULL;
+  } else {
+    name=tr_new_name(json_string_value(jname));
+    if (name==NULL) {
+      tr_err("tr_cfg_parse_name: could not allocate name");
+      *rc=TR_CFG_NOMEM;
+    } else {
+      *rc=TR_CFG_SUCCESS;
     }
+  }
+  return name;  
+}
+
+static int tr_cfg_parse_shared_config(json_t *jsc, TR_CFG_RC *rc)
+{
+  const char *shared=NULL;
+  *rc=TR_CFG_SUCCESS;
   
-    if (TR_MAX_FILTER_SPECS < json_array_size(jfspecs)) {
-      fprintf(stderr, "tr_cfg_parse_one_filter: Filter has too many filter_specs, maximimum of %d.\n", TR_MAX_FILTER_SPECS);
-      *rc = TR_CFG_NOPARSE;
-      tr_filter_free(filt);
-      return NULL;
-    }
+  if ((jsc==NULL) ||
+      (!json_is_string(jsc)) ||
+      (NULL==(shared=json_string_value(jsc)))) {
+    *rc=TR_CFG_BAD_PARAMS;
+    return -1;
+  }
 
-    if (NULL == (filt->lines[i] = malloc(sizeof(TR_FLINE)))) {
-      fprintf(stderr, "tr_config_parse_one_filter: Out of memory.\n");
-      *rc = TR_CFG_NOMEM;
-      tr_filter_free(filt);
-      return NULL;
-    }
+  if (0==strcmp(shared, "no"))
+    return 0;
+  else if (0==strcmp(shared, "yes"))
+    return 1;
 
-    memset(filt->lines[i], 0, sizeof(TR_FLINE));
+  /* any other value is an error */
+  tr_debug("tr_cfg_parse_shared_config: invalid shared_config value \"%s\" (should be \"yes\" or \"no\")",
+           shared);
+  *rc=TR_CFG_NOPARSE;
+  return -1;
+}
 
-    if (!strcmp(json_string_value(jfaction), "accept")) {
-	filt->lines[i]->action = TR_FILTER_ACTION_ACCEPT;
+static TR_REALM_ORIGIN tr_cfg_realm_origin(json_t *jrealm)
+{
+  json_t *jremote=json_object_get(jrealm, "remote");
+  const char *s=NULL;
+
+  if (jremote==NULL)
+    return TR_REALM_LOCAL;
+  if (!json_is_string(jremote)) {
+    tr_warning("tr_cfg_realm_origin: \"remote\" is not a string, assuming this is a local realm.");
+    return TR_REALM_LOCAL;
+  }
+  s=json_string_value(jremote);
+  if (strcasecmp(s, "yes")==0)
+    return TR_REALM_REMOTE_INCOMPLETE;
+  else if (strcasecmp(s, "no")!=0)
+    tr_warning("tr_cfg_realm_origin: \"remote\" is neither 'yes' nor 'no', assuming this is a local realm.");
+
+  return TR_REALM_LOCAL;
+}
+
+/* Parse the identity provider object from a realm and fill in the given TR_IDP_REALM. */
+static TR_CFG_RC tr_cfg_parse_idp(TR_IDP_REALM *idp, json_t *jidp)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_APC *apcs=NULL;
+  TR_AAA_SERVER *aaa=NULL;
+  TR_CFG_RC rc=TR_CFG_ERROR;
+  
+  if (jidp==NULL)
+    goto cleanup;
+
+  idp->shared_config=tr_cfg_parse_shared_config(json_object_get(jidp, "shared_config"), &rc);
+  if (rc!=TR_CFG_SUCCESS) {
+    tr_err("tr_cfg_parse_idp: missing or malformed shared_config specification");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+
+  apcs=tr_cfg_parse_apcs(tmp_ctx, json_object_get(jidp, "apcs"), &rc);
+  if ((rc!=TR_CFG_SUCCESS) || (apcs==NULL)) {
+    tr_err("tr_cfg_parse_idp: unable to parse APC");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  
+  aaa=tr_cfg_parse_aaa_servers(idp, json_object_get(jidp, "aaa_servers"), &rc);
+  if (rc!=TR_CFG_SUCCESS) {
+    tr_err("tr_cfg_parse_idp: unable to parse AAA servers");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  
+  tr_debug("tr_cfg_parse_idp: APC=\"%.*s\"",
+           apcs->id->len,
+           apcs->id->buf);
+  
+  /* done, fill in the idp structures */
+  idp->apcs=apcs;
+  talloc_steal(idp, apcs);
+  idp->aaa_servers=aaa;
+  rc=TR_CFG_SUCCESS;
+  
+cleanup:
+  if (rc!=TR_CFG_SUCCESS) {
+    if (apcs!=NULL)
+      tr_apc_free(apcs);
+    if (aaa!=NULL)
+      tr_aaa_server_free(aaa);
+  }
+  
+  talloc_free(tmp_ctx);
+  return rc;
+}
+
+/* parses idp realm */
+static TR_IDP_REALM *tr_cfg_parse_one_idp_realm(TALLOC_CTX *mem_ctx, json_t *jrealm, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_IDP_REALM *realm=NULL;
+  TR_CFG_RC call_rc=TR_CFG_ERROR;
+
+  *rc=TR_CFG_ERROR; /* default to error if not set */
+
+  if ((!jrealm) || (!rc)) {
+    tr_err("tr_cfg_parse_one_idp_realm: Bad parameters.");
+    if (rc)
+      *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
+
+  if (NULL==(realm=tr_idp_realm_new(tmp_ctx))) {
+    tr_err("tr_cfg_parse_one_idp_realm: could not allocate idp realm.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+
+  realm->origin=tr_cfg_realm_origin(jrealm);
+  if (realm->origin!=TR_REALM_LOCAL) {
+    tr_debug("tr_cfg_parse_one_idp_realm: realm is remote, should not have full IdP info.");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+
+  /* must have a name */
+  realm->realm_id=tr_cfg_parse_name(realm,
+                                    json_object_get(jrealm, "realm"),
+                                   &call_rc);
+  if ((call_rc!=TR_CFG_SUCCESS) || (realm->realm_id==NULL)) {
+    tr_err("tr_cfg_parse_one_idp_realm: could not parse realm name");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  tr_debug("tr_cfg_parse_one_idp_realm: realm_id=\"%.*s\"",
+           realm->realm_id->len,
+           realm->realm_id->buf);
+        
+  call_rc=tr_cfg_parse_idp(realm, json_object_get(jrealm, "identity_provider"));
+  if (call_rc!=TR_CFG_SUCCESS) {
+    tr_err("tr_cfg_parse_one_idp_realm: could not parse identity_provider.");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  
+  *rc=TR_CFG_SUCCESS;
+
+cleanup:
+  if (*rc==TR_CFG_SUCCESS)
+    talloc_steal(mem_ctx, realm);
+  else {
+    talloc_free(realm);
+    realm=NULL;
+  }
+  
+  talloc_free(tmp_ctx);
+  return realm;
+}
+
+  /* Determine whether the realm is an IDP realm */
+static int tr_cfg_is_idp_realm(json_t *jrealm)
+{
+  /* If a realm spec contains an identity_provider, it's an IDP realm. */
+  if (NULL != json_object_get(jrealm, "identity_provider"))
+    return 1;
+  else
+    return 0;
+}
+
+static TR_IDP_REALM *tr_cfg_parse_one_remote_realm(TALLOC_CTX *mem_ctx, json_t *jrealm, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_IDP_REALM *realm=talloc(mem_ctx, TR_IDP_REALM);
+  
+  *rc=TR_CFG_ERROR; /* default to error if not set */
+
+  if ((!jrealm) || (!rc)) {
+    tr_err("tr_cfg_parse_one_remote_realm: Bad parameters.");
+    if (rc)
+      *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
+
+  if (NULL==(realm=tr_idp_realm_new(tmp_ctx))) {
+    tr_err("tr_cfg_parse_one_remote_realm: could not allocate idp realm.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+
+  /* must have a name */
+  realm->realm_id=tr_cfg_parse_name(realm,
+                                    json_object_get(jrealm, "realm"),
+                                    rc);
+  if ((*rc!=TR_CFG_SUCCESS) || (realm->realm_id==NULL)) {
+    tr_err("tr_cfg_parse_one_remote_realm: could not parse realm name");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  tr_debug("tr_cfg_parse_one_remote_realm: realm_id=\"%.*s\"",
+           realm->realm_id->len,
+           realm->realm_id->buf);
+
+  realm->origin=tr_cfg_realm_origin(jrealm);
+  *rc=TR_CFG_SUCCESS;
+
+cleanup:
+  if (*rc==TR_CFG_SUCCESS)
+    talloc_steal(mem_ctx, realm);
+  else {
+    talloc_free(realm);
+    realm=NULL;
+  }
+  
+  talloc_free(tmp_ctx);
+  return realm;
+}
+
+static int tr_cfg_is_remote_realm(json_t *jrealm)
+{
+  return (tr_cfg_realm_origin(jrealm)!=TR_REALM_LOCAL);
+}
+
+/* Parse any idp realms in the j_realms object. Ignores other realm types. */
+static TR_IDP_REALM *tr_cfg_parse_idp_realms(TALLOC_CTX *mem_ctx, json_t *jrealms, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_IDP_REALM *realms=NULL;
+  TR_IDP_REALM *new_realm=NULL;
+  json_t *this_jrealm=NULL;
+  int ii=0;
+
+  *rc=TR_CFG_ERROR;
+  if ((jrealms==NULL) || (!json_is_array(jrealms))) {
+    tr_err("tr_cfg_parse_idp_realms: realms not an array");
+    *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
+
+  for (ii=0; ii<json_array_size(jrealms); ii++) {
+    this_jrealm=json_array_get(jrealms, ii);
+    if (tr_cfg_is_idp_realm(this_jrealm)) {
+      new_realm=tr_cfg_parse_one_idp_realm(tmp_ctx, this_jrealm, rc);
+      if ((*rc)!=TR_CFG_SUCCESS) {
+        tr_err("tr_cfg_parse_idp_realms: error decoding realm entry %d", ii+1);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
+      realms=tr_idp_realm_add(realms, new_realm);
+    } else if (tr_cfg_is_remote_realm(this_jrealm)) {
+      new_realm=tr_cfg_parse_one_remote_realm(tmp_ctx, this_jrealm, rc);
+      if ((*rc)!=TR_CFG_SUCCESS) {
+        tr_err("tr_cfg_parse_idp_realms: error decoding remote realm entry %d", ii+1);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
+      realms=tr_idp_realm_add(realms, new_realm);
     }
-    else if (!strcmp(json_string_value(jfaction), "reject")) {
-      filt->lines[i]->action = TR_FILTER_ACTION_REJECT;
+  }
+  
+  *rc=TR_CFG_SUCCESS;
+  talloc_steal(mem_ctx, realms);
+
+cleanup:
+  talloc_free(tmp_ctx);
+  return realms;
+}
+
+#if 0
+static TR_IDP_REALM *tr_cfg_parse_remote_realms(TALLOC_CTX *mem_ctx, json_t *jrealms, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_IDP_REALM *realms=NULL;
+  TR_IDP_REALM *new_realm=NULL;
+  json_t *this_jrealm=NULL;
+  int ii=0;
+
+  *rc=TR_CFG_ERROR;
+  if ((jrealms==NULL) || (!json_is_array(jrealms))) {
+    tr_err("tr_cfg_parse_remote_realms: realms not an array");
+    *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
+
+  for (ii=0; ii<json_array_size(jrealms); ii++) {
+    this_jrealm=json_array_get(jrealms, ii);
+    if (tr_cfg_is_remote_realm(this_jrealm)) {
+      new_realm=tr_cfg_parse_one_remote_realm(tmp_ctx, this_jrealm, rc);
+      if ((*rc)!=TR_CFG_SUCCESS) {
+        tr_err("tr_cfg_parse_remote_realms: error decoding remote realm entry %d", ii+1);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
+      realms=tr_idp_realm_add(realms, new_realm);
     }
-    else {
-      fprintf(stderr, "tr_cfg_parse_one_filter: Error parsing filter action, unknown action' %s'.\n", json_string_value(jfaction));
-      *rc = TR_CFG_NOPARSE;
-      tr_filter_free(filt);
-      return NULL;
+  }
+  
+  *rc=TR_CFG_SUCCESS;
+  talloc_steal(mem_ctx, realms);
+
+cleanup:
+  talloc_free(tmp_ctx);
+  return realms;
+}
+#endif /* 0 */
+
+static TR_GSS_NAMES *tr_cfg_parse_gss_names(TALLOC_CTX *mem_ctx, json_t *jgss_names, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_GSS_NAMES *gn=NULL;
+  json_t *jname=NULL;
+  int ii=0;
+  TR_NAME *name=NULL;
+
+  if ((rc==NULL) || (jgss_names==NULL)) {
+    tr_err("tr_cfg_parse_gss_names: Bad parameters.");
+    *rc=TR_CFG_BAD_PARAMS;
+
+  }
+
+  if (!json_is_array(jgss_names)) {
+    tr_err("tr_cfg_parse_gss_names: gss_names not an array.");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+
+  gn=tr_gss_names_new(tmp_ctx);
+  for (ii=0; ii<json_array_size(jgss_names); ii++) {
+    jname=json_array_get(jgss_names, ii);
+    if (!json_is_string(jname)) {
+      tr_err("tr_cfg_parse_gss_names: Encountered non-string gss name.");
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
     }
-      
-    /*For each filter spec within the filter line... */
-    for (j = 0; j <json_array_size(jfspecs); j++) {
-      
-      if ((NULL == (jffield = json_object_get(json_array_get(jfspecs, j), "field"))) ||
-	  (!json_is_string(jffield)) ||
-	  (NULL == (jfmatch = json_object_get(json_array_get(jfspecs, j), "match"))) ||
-	  (!json_is_string(jfmatch))) {
-	fprintf (stderr, "tr_cfg_parse_one_filter: Error parsing filter field and match for filter spec %d, filter line %d.\n", i, j);
-	*rc = TR_CFG_NOPARSE;
-	tr_filter_free(filt);
-	return NULL;
-      }
 
-      if (NULL == (filt->lines[i]->specs[j] = malloc(sizeof(TR_FSPEC)))) {
-	fprintf(stderr, "tr_config_parse_one_filter: Out of memory.\n");
-	*rc = TR_CFG_NOMEM;
-	tr_filter_free(filt);
-	return NULL;
-      }
+    name=tr_new_name(json_string_value(jname));
+    if (name==NULL) {
+      tr_err("tr_cfg_parse_gss_names: Out of memory allocating gss name.");
+      *rc=TR_CFG_NOMEM;
+      goto cleanup;
+    }
 
-      memset(filt->lines[i]->specs[j], 0, sizeof(TR_FSPEC));
-    
-      if ((NULL == (filt->lines[i]->specs[j]->field = tr_new_name((char *)json_string_value(jffield)))) ||
-	  (NULL == (filt->lines[i]->specs[j]->match = tr_new_name((char *)json_string_value(jfmatch))))) {
-	fprintf(stderr, "tr_config_parse_one_filter: Out of memory.\n");
-	*rc = TR_CFG_NOMEM;
-	tr_filter_free(filt);
-	return NULL;
-      }
+    if (tr_gss_names_add(gn, name)!=0) {
+      tr_free_name(name);
+      tr_err("tr_cfg_parse_gss_names: Unable to add gss name to RP client.");
+      *rc=TR_CFG_ERROR;
+      goto cleanup;
     }
   }
-  return filt;
+
+  talloc_steal(mem_ctx, gn);
+  *rc=TR_CFG_SUCCESS;
+
+ cleanup:
+  talloc_free(tmp_ctx);
+  if ((*rc!=TR_CFG_SUCCESS) && (gn!=NULL))
+    gn=NULL;
+  return gn;
 }
 
-static TR_RP_CLIENT *tr_cfg_parse_one_rp_client (TR_INSTANCE *tr, json_t *jrp, TR_CFG_RC *rc)
+/* default filter accepts realm and *.realm */
+static TR_FILTER *tr_cfg_default_filter(TALLOC_CTX *mem_ctx, TR_NAME *realm, TR_CFG_RC *rc)
 {
-  TR_RP_CLIENT *rp = NULL;
-  json_t *jgns = NULL;
-  json_t *jfilt = NULL;
-  json_t *jftype = NULL;
-  int i = 0;
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_FILTER *filt=NULL;
+  TR_CONSTRAINT *cons=NULL;
+  TR_NAME *name=NULL;
+  TR_NAME *n_prefix=tr_new_name("*.");
+  TR_NAME *n_rp_realm_1=tr_new_name("rp_realm");
+  TR_NAME *n_rp_realm_2=tr_new_name("rp_realm");
+  TR_NAME *n_domain=tr_new_name("domain");
+  TR_NAME *n_realm=tr_new_name("realm");
+  
 
-  if ((!jrp) || (!rc)) {
-    fprintf(stderr, "tr_cfg_parse_one_rp_realm: Bad parameters.\n");
-    if (rc)
-      *rc = TR_CFG_BAD_PARAMS;
-    return NULL;
+  if ((realm==NULL) || (rc==NULL)) {
+    tr_debug("tr_cfg_default_filter: invalid arguments.");
+    if (rc!=NULL)
+      *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
   }
 
-  if ((NULL == (jgns = json_object_get(jrp, "gss_names"))) ||
-      (!json_is_array(jgns))) {
-    fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client configuration, no GSS names.\n");
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+  if ((n_prefix==NULL) ||
+      (n_rp_realm_1==NULL) ||
+      (n_rp_realm_2==NULL) ||
+      (n_domain==NULL) ||
+      (n_realm==NULL)) {
+    tr_debug("tr_cfg_default_filter: unable to allocate names.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
 
-  /* TBD -- Support more than one filter per RP client? */
-  if (NULL == (jfilt = json_object_get(jrp, "filter"))) {
-    fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client configuration, no filter.\n");
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+  filt=tr_filter_new(tmp_ctx);
+  if (filt==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate filter.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+  tr_filter_set_type(filt, TR_FILTER_TYPE_TID_INCOMING);
+  filt->lines[0]=tr_fline_new(filt);
+  if (filt->lines[0]==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate filter line.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
 
-  /* We only support rp_permitted filters for RP clients */
-  if ((NULL == (jftype = json_object_get(jfilt, "type"))) ||
-      (!json_is_string(jftype)) ||
-      (strcmp(json_string_value(jftype), "rp_permitted"))) {
-    fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing RP client filter type.\n");
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+  filt->lines[0]->action=TR_FILTER_ACTION_ACCEPT;
+  filt->lines[0]->specs[0]=tr_fspec_new(filt->lines[0]);
+  filt->lines[0]->specs[0]->field=n_rp_realm_1;
+  n_rp_realm_1=NULL; /* we don't own this name any more */
+
+  name=tr_dup_name(realm);
+  if (name==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate realm name.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+  tr_fspec_set_match(filt->lines[0]->specs[0], name);
+  name=NULL; /* we no longer own the name */
+
+  /* now do the wildcard name */
+  filt->lines[0]->specs[1]=tr_fspec_new(filt->lines[0]);
+  filt->lines[0]->specs[1]->field=n_rp_realm_2;
+  n_rp_realm_2=NULL; /* we don't own this name any more */
+
+  if (NULL==(name=tr_name_cat(n_prefix, realm))) {
+    tr_debug("tr_cfg_default_filter: could not allocate wildcard realm name.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
 
-  if (TR_MAX_GSS_NAMES < json_array_size(jgns)) {
-    fprintf(stderr, "tr_cfg_parse_one_rp_client: RP Client has too many GSS Names.\n");
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+  tr_fspec_set_match(filt->lines[0]->specs[1], name);
+  name=NULL; /* we no longer own the name */
+
+  /* domain constraint */
+  if (NULL==(cons=tr_constraint_new(filt->lines[0]))) {
+    tr_debug("tr_cfg_default_filter: could not allocate domain constraint.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
 
-  if (NULL == (rp = malloc(sizeof(TR_RP_CLIENT)))) {
-    fprintf(stderr, "tr_config_parse_one_rp_realm: Out of memory.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+  cons->type=n_domain;
+  n_domain=NULL; /* belongs to the constraint now */
+  name=tr_dup_name(realm);
+  if (name==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate realm name for domain constraint.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
-  
-  memset(rp, 0, sizeof(TR_RP_CLIENT));
+  cons->matches[0]=name;
+  name=tr_name_cat(n_prefix, realm);
+  if (name==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate wildcard realm name for domain constraint.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+  cons->matches[1]=name;
+  name=NULL;
+  filt->lines[0]->domain_cons=cons;
 
-  /* TBD -- support more than one filter entry per RP Client? */
-  if (NULL == (rp->filter = tr_cfg_parse_one_filter(tr, jfilt, rc))) {
-    fprintf(stderr, "tr_cfg_parse_one_rp_client: Error parsing filter.\n");
-    free(rp);
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+
+  /* realm constraint */
+  if (NULL==(cons=tr_constraint_new(filt->lines[0]))) {
+    tr_debug("tr_cfg_default_filter: could not allocate realm constraint.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
-    
-  for (i = 0; i < json_array_size(jgns); i++) {
-    if (NULL == (rp->gss_names[i] = tr_new_name ((char *)json_string_value(json_array_get(jgns, i))))) {
-      fprintf(stderr, "tr_cfg_parse_one_rp_client: No memory for GSS Name.\n");
-      free(rp);
-      *rc = TR_CFG_NOMEM;
-      return NULL;
-    }
+
+  cons->type=n_realm;
+  n_realm=NULL; /* belongs to the constraint now */
+  name=tr_dup_name(realm);
+  if (name==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate realm name for realm constraint.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
-  
-  return rp;
+  cons->matches[0]=name;
+  name=tr_name_cat(n_prefix, realm);
+  if (name==NULL) {
+    tr_debug("tr_cfg_default_filter: could not allocate wildcard realm name for realm constraint.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+  cons->matches[1]=name;
+  name=NULL;
+  filt->lines[0]->realm_cons=cons;
+
+  talloc_steal(mem_ctx, filt);
+cleanup:
+  talloc_free(tmp_ctx);
+
+  if (*rc!=TR_CFG_SUCCESS)
+    filt=NULL;
+
+  if (n_prefix!=NULL)
+    tr_free_name(n_prefix);
+  if (n_rp_realm_1!=NULL)
+    tr_free_name(n_rp_realm_1);
+  if (n_rp_realm_2!=NULL)
+    tr_free_name(n_rp_realm_2);
+  if (n_realm!=NULL)
+    tr_free_name(n_realm);
+  if (n_domain!=NULL)
+    tr_free_name(n_domain);
+  if (name!=NULL)
+    tr_free_name(name);
+
+  return filt;
 }
 
-static TR_CFG_RC tr_cfg_parse_rp_clients (TR_INSTANCE *tr, json_t *jcfg) {
-  json_t *jrps = NULL;
-  TR_RP_CLIENT *rp = NULL;
-  TR_CFG_RC rc = TR_CFG_SUCCESS;
-  int i = 0;
+/* parses rp client */
+static TR_RP_CLIENT *tr_cfg_parse_one_rp_client(TALLOC_CTX *mem_ctx, json_t *jrealm, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_RP_CLIENT *client=NULL;
+  TR_CFG_RC call_rc=TR_CFG_ERROR;
+  TR_FILTER *new_filt=NULL;
+  TR_NAME *realm=NULL;
+  json_t *jfilt=NULL;
+  json_t *jrealm_id=NULL;
+
+  *rc=TR_CFG_ERROR; /* default to error if not set */
+
+  if ((!jrealm) || (!rc)) {
+    tr_err("tr_cfg_parse_one_rp_client: Bad parameters.");
+    if (rc)
+      *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
 
-  if ((!tr) || (!tr->new_cfg) || (!jcfg))
-    return TR_CFG_BAD_PARAMS;
+  if ((NULL==(jrealm_id=json_object_get(jrealm, "realm"))) || (!json_is_string(jrealm_id))) {
+    tr_debug("tr_cfg_parse_one_rp_client: no realm ID found.");
+    *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  } 
 
-  if ((NULL == (jrps = json_object_get(jcfg, "rp_clients"))) ||
-      (!json_is_array(jrps))) {
-    return TR_CFG_NOPARSE;
+  tr_debug("tr_cfg_parse_one_rp_client: realm_id=\"%s\"", json_string_value(jrealm_id));
+  realm=tr_new_name(json_string_value(jrealm_id));
+  if (realm==NULL) {
+    tr_err("tr_cfg_parse_one_rp_client: could not allocate realm ID.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
 
-  for (i = 0; i < json_array_size(jrps); i++) {
-    if (NULL == (rp = tr_cfg_parse_one_rp_client(tr, 
-						 json_array_get(jrps, i), 
-						 &rc))) {
-       return rc;
-    }
-    fprintf(stderr, "tr_cfg_parse_rp_clients: RP client configured -- first gss: %s", rp->gss_names[0]->buf);
-    rp->next = tr->new_cfg->rp_clients;
-    tr->new_cfg->rp_clients = rp;
+  if (NULL==(client=tr_rp_client_new(tmp_ctx))) {
+    tr_err("tr_cfg_parse_one_rp_client: could not allocate rp client.");
+    *rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
-  return rc;
-}
 
-static TR_AAA_SERVER *tr_cfg_parse_one_aaa_server (TR_INSTANCE *tr, json_t *jaddr, TR_CFG_RC *rc) {
-  TR_AAA_SERVER *aaa = NULL;
+  client->gss_names=tr_cfg_parse_gss_names(client, json_object_get(jrealm, "gss_names"), &call_rc);
 
-  if ((!tr) || (!tr->new_cfg) || (!jaddr) || (!json_is_string(jaddr))) {
-    fprintf(stderr, "tr_cfg_parse_one_aaa_server: Bad parameters.\n");
-    *rc = TR_CFG_BAD_PARAMS;
-    return NULL;
+  if (call_rc!=TR_CFG_SUCCESS) {
+    tr_err("tr_cfg_parse_one_rp_client: could not parse gss_names.");
+    *rc=TR_CFG_NOPARSE;
+    goto cleanup;
   }
 
-  if (NULL == (aaa = malloc(sizeof(TR_AAA_SERVER)))) {
-    fprintf(stderr, "tr_config_parse_one_aaa_server: Out of memory.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+  /* parse filters */
+  jfilt=json_object_get(jrealm, "filters");
+  if (jfilt!=NULL) {
+    new_filt=tr_cfg_parse_filters(tmp_ctx, jfilt, &call_rc);
+    if (call_rc!=TR_CFG_SUCCESS) {
+      tr_err("tr_cfg_parse_one_rp_client: could not parse filters.");
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
+  } else {
+    tr_debug("tr_cfg_parse_one_rp_client: no filters specified, using default filters.");
+    new_filt=tr_cfg_default_filter(tmp_ctx, realm, &call_rc);
+    if (call_rc!=TR_CFG_SUCCESS) {
+      tr_err("tr_cfg_parse_one_rp_client: could not set default filters.");
+      *rc=TR_CFG_NOPARSE;
+      goto cleanup;
+    }
   }
 
-  memset(aaa, 0, sizeof(TR_AAA_SERVER));
+  tr_rp_client_set_filter(client, new_filt);
+  *rc=TR_CFG_SUCCESS;
 
-  /* TBD -- Handle IPv6 addresses */
-  inet_aton(json_string_value(jaddr), &(aaa->aaa_server_addr));
+  cleanup:
+  if (realm!=NULL)
+    tr_free_name(realm);
 
-  return aaa;
-}
+    if (*rc==TR_CFG_SUCCESS)
+      talloc_steal(mem_ctx, client);
+    else {
+      talloc_free(client);
+      client=NULL;
+    }
 
+    talloc_free(tmp_ctx);
+    return client;
+  }
 
-static TR_AAA_SERVER *tr_cfg_parse_aaa_servers (TR_INSTANCE *tr, json_t *jaaas, TR_CFG_RC *rc) 
+  /* Determine whether the realm is an RP realm */
+static int tr_cfg_is_rp_realm(json_t *jrealm)
 {
-  TR_AAA_SERVER *aaa = NULL;
-  TR_AAA_SERVER *temp_aaa = NULL;
-  int i = 0;
+  /* Check that we have a gss name. */
+  if (NULL != json_object_get(jrealm, "gss_names"))
+    return 1;
+  else
+    return 0;
+}
 
-  for (i = 0; i < json_array_size(jaaas); i++) {
-    if (NULL == (temp_aaa = tr_cfg_parse_one_aaa_server(tr, json_array_get(jaaas, i), rc))) {
-      return NULL;
+/* Parse any rp clients in the j_realms object. Ignores other realms. */
+static TR_RP_CLIENT *tr_cfg_parse_rp_clients(TALLOC_CTX *mem_ctx, json_t *jrealms, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_RP_CLIENT *clients=NULL;
+  TR_RP_CLIENT *new_client=NULL;
+  json_t *this_jrealm=NULL;
+  int ii=0;
+
+  *rc=TR_CFG_ERROR;
+  if ((jrealms==NULL) || (!json_is_array(jrealms))) {
+    tr_err("tr_cfg_parse_rp_clients: realms not an array");
+    *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
+
+  for (ii=0; ii<json_array_size(jrealms); ii++) {
+    this_jrealm=json_array_get(jrealms, ii);
+    if (tr_cfg_is_rp_realm(this_jrealm)) {
+      new_client=tr_cfg_parse_one_rp_client(tmp_ctx, this_jrealm, rc);
+      if ((*rc)!=TR_CFG_SUCCESS) {
+        tr_err("tr_cfg_parse_rp_clients: error decoding realm entry %d", ii+1);
+        *rc=TR_CFG_NOPARSE;
+        goto cleanup;
+      }
+      clients=tr_rp_client_add(clients, new_client);
     }
-    /* TBD -- IPv6 addresses */
-    //    fprintf(stderr, "tr_cfg_parse_aaa_servers: Configuring AAA Server: ip_addr = %s.\n", inet_ntoa(temp_aaa->aaa_server_addr));
-    temp_aaa->next = aaa;
-    aaa = temp_aaa;
   }
-  return aaa;
+  
+  *rc=TR_CFG_SUCCESS;
+  talloc_steal(mem_ctx, clients);
+
+cleanup:
+  talloc_free(tmp_ctx);
+  return clients;
 }
 
-static TR_APC *tr_cfg_parse_apcs (TR_INSTANCE *tr, json_t *japcs, TR_CFG_RC *rc)
+/* takes a talloc context, but currently does not use it */
+static TR_NAME *tr_cfg_parse_org_name(TALLOC_CTX *mem_ctx, json_t *j_org, TR_CFG_RC *rc)
 {
-  TR_APC *apc;
-
-  *rc = TR_CFG_SUCCESS;		/* presume success */
+  TR_NAME *name=NULL;
 
-  if ((!japcs) || (!rc)) {
-    fprintf(stderr, "tr_cfg_parse_apcs: Bad parameters.\n");
-    if (rc) 
-      *rc = TR_CFG_BAD_PARAMS;
+  if ((j_org==NULL) || (rc==NULL) || (!json_is_string(j_org))) {
+    tr_debug("tr_cfg_parse_org_name: Bad parameters.");
+    if (rc!=NULL)
+      *rc = TR_CFG_BAD_PARAMS; /* fill in return value if we can */
     return NULL;
   }
 
-  if (NULL == (apc = malloc(sizeof(TR_APC)))) {
-    fprintf (stderr, "tr_cfg_parse_apcs: Out of memory.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+  name=tr_new_name(json_string_value(j_org));
+  if (name==NULL)
+    *rc=TR_CFG_NOMEM;
+  else
+    *rc=TR_CFG_SUCCESS;
+  return name;
+}
+
+#if 0
+/* Update the community information with data from a new batch of IDP realms.
+ * May partially add realms if there is a failure, no guarantees.
+ * Call like comms=tr_comm_idp_update(comms, new_realms, &rc) */
+static TR_COMM *tr_cfg_comm_idp_update(TALLOC_CTX *mem_ctx, TR_COMM *comms, TR_IDP_REALM *new_realms, TR_CFG_RC *rc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_COMM *comm=NULL; /* community looked up in comms table */
+  TR_COMM *new_comms=NULL; /* new communities as we create them */
+  TR_IDP_REALM *realm=NULL;
+  TR_APC *apc=NULL; /* apc of one realm */
+
+  if (rc==NULL) {
+    *rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
   }
 
-  memset(apc, 0, sizeof(TR_APC));
+  /* start with an empty list communities, then fill that in */
+  for (realm=new_realms; realm!=NULL; realm=realm->next) {
+    for (apc=realm->apcs; apc!=NULL; apc=apc->next) {
+      comm=tr_comm_lookup(comms, apc->id);
+      if (comm==NULL) {
+        comm=tr_comm_new(tmp_ctx);
+        if (comm==NULL) {
+          tr_debug("tr_cfg_comm_idp_update: unable to allocate new community.");
+          *rc=TR_CFG_NOMEM;
+          goto cleanup;
+        }
+        /* fill in the community with info */
+        comm->type=TR_COMM_APC; /* realms added this way are in APCs */
+        comm->expiration_interval=TR_DEFAULT_APC_EXPIRATION_INTERVAL;
+        comm->id=tr_dup_name(apc->id);
+        tr_comm_add_idp_realm(comm, realm);
+        new_comms=tr_comm_add(new_comms, comm);
+      } else {
+        /* add this realm to the comm */
+        tr_comm_add_idp_realm(comm, realm);
+      }
+    }
+  }
 
-  /* TBD, deal with more than one APC.  In the meantime, though...                */
-  /* Only parse the first APC, because we only know how to deal with one, anyway. */
-  if (0 == json_array_size(japcs))
-    return NULL;
+  /* we successfully built a list, add it to the other list */
+  comms=tr_comm_add(comms, new_comms);
+  talloc_steal(mem_ctx, comms);
+ cleanup:
+  talloc_free(tmp_ctx);
+  return comms;
+}
+#endif
 
-  if (NULL == (apc->id = tr_new_name((char *)json_string_value(json_array_get(japcs, 0))))) {
-    fprintf(stderr, "tr_cfg_parse_apcs: No memory for APC name.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+static TR_CFG_RC tr_cfg_parse_one_local_org(TR_CFG *trc, json_t *jlorg)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_CFG_RC retval=TR_CFG_ERROR; /* our return code */
+  TR_CFG_RC rc=TR_CFG_ERROR; /* return code from functions we call */
+  TR_NAME *org_name=NULL;
+  json_t *j_org=NULL;
+  json_t *j_realms=NULL;
+  TR_IDP_REALM *new_idp_realms=NULL;
+  TR_RP_CLIENT *new_rp_clients=NULL;
+
+  tr_debug("tr_cfg_parse_one_local_org: parsing local organization");
+
+  /* get organization_name (optional) */
+  if (NULL==(j_org=json_object_get(jlorg, "organization_name"))) {
+    tr_debug("tr_cfg_parse_one_local_org: organization_name unspecified");
+  } else {
+    org_name=tr_cfg_parse_org_name(tmp_ctx, j_org, &rc);
+    if (rc==TR_CFG_SUCCESS) {
+      tr_debug("tr_cfg_parse_one_local_org: organization_name=\"%.*s\"",
+               org_name->len,
+               org_name->buf);
+      /* we don't actually do anything with this, but we could */
+      tr_free_name(org_name);
+      org_name=NULL; 
+    }
   }
 
-  return apc;
+  /* Now get realms. Allow this to be missing; even though that is a pointless organization entry,
+   * it's harmless. Report a warning because that might be unintentional. */
+  if (NULL==(j_realms=json_object_get(jlorg, "realms"))) {
+    tr_warning("tr_cfg_parse_one_local_org: warning - no realms in this local organization");
+  } else {
+    /* Allocate in the tmp_ctx so these will be cleaned up if we do not complete successfully. */
+    new_idp_realms=tr_cfg_parse_idp_realms(tmp_ctx, j_realms, &rc);
+    if (rc!=TR_CFG_SUCCESS)
+      goto cleanup;
+
+    new_rp_clients=tr_cfg_parse_rp_clients(tmp_ctx, j_realms, &rc);
+    if (rc!=TR_CFG_SUCCESS)
+      goto cleanup;
+  }
+  retval=TR_CFG_SUCCESS;
+  
+cleanup:
+  /* if we succeeded, link things to the configuration and move out of tmp context */
+  if (retval==TR_CFG_SUCCESS) {
+    if (new_idp_realms!=NULL) {
+      trc->idp_realms=tr_idp_realm_add(trc->idp_realms, new_idp_realms); /* fixes talloc contexts except for head*/
+      talloc_steal(trc, trc->idp_realms); /* make sure the head is in the right context */
+    }
+
+    if (new_rp_clients!=NULL) {
+      trc->rp_clients=tr_rp_client_add(trc->rp_clients, new_rp_clients); /* fixes talloc contexts */
+      talloc_steal(trc, trc->rp_clients); /* make sure head is in the right context */
+    }
+  }
+
+  talloc_free(tmp_ctx);
+  return rc;
 }
 
-static TR_IDP_REALM *tr_cfg_parse_one_idp_realm (TR_INSTANCE *tr, json_t *jidp, TR_CFG_RC *rc) {
-  TR_IDP_REALM *idp = NULL;
-  json_t *jrid = NULL;
-  json_t *jscfg = NULL;
-  json_t *jsrvrs = NULL;
-  json_t *japcs = NULL;
+/* Parse local organizations if present. Returns success if there are none. On failure, the configuration is unreliable. */
+static TR_CFG_RC tr_cfg_parse_local_orgs(TR_CFG *trc, json_t *jcfg)
+{
+  json_t *jlocorgs=NULL;
+  int ii=0;
 
-  if ((!jidp) || (!rc)) {
-    fprintf(stderr, "tr_cfg_parse_one_idp_realm: Bad parameters.\n");
-    if (rc)
-      *rc = TR_CFG_BAD_PARAMS;
-    return NULL;
+  jlocorgs=json_object_get(jcfg, "local_organizations");
+  if (jlocorgs==NULL)
+    return TR_CFG_SUCCESS;
+
+  if (!json_is_array(jlocorgs)) {
+    tr_err("tr_cfg_parse_local_orgs: local_organizations is not an array.");
+    return TR_CFG_NOPARSE;
   }
 
-  if (NULL == (idp = malloc(sizeof(TR_IDP_REALM)))) {
-    fprintf(stderr, "tr_config_parse_one_idp_realm: Out of memory.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+  for (ii=0; ii<json_array_size(jlocorgs); ii++) {
+    if (tr_cfg_parse_one_local_org(trc, json_array_get(jlocorgs, ii))!=TR_CFG_SUCCESS) {
+      tr_err("tr_cfg_parse_local_orgs: error parsing local_organization %d.", ii+1);
+      return TR_CFG_NOPARSE;
+    }
   }
 
-  memset(idp, 0, sizeof(TR_IDP_REALM));
+  return TR_CFG_SUCCESS;
+}
 
-  if ((NULL == (jrid = json_object_get(jidp, "realm_id"))) ||
-      (!json_is_string(jrid)) ||
-      (NULL == (jscfg = json_object_get(jidp, "shared_config"))) ||
-      (!json_is_string(jscfg)) ||
-      (NULL == (jsrvrs = json_object_get(jidp, "aaa_servers"))) ||
-      (!json_is_array(jsrvrs))) {
-    fprintf(stderr, "tr_cfg_parse_one_idp_realm: Error parsing IDP realm configuration.\n");
-    free(idp);
-    *rc = TR_CFG_NOPARSE;
-    return NULL;
+static TR_CFG_RC tr_cfg_parse_one_peer_org(TR_CFG *trc, json_t *jporg)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  json_t *jhost=NULL;
+  json_t *jport=NULL;
+  json_t *jgss=NULL;
+  TRP_PEER *new_peer=NULL;
+  TR_GSS_NAMES *names=NULL;
+  TR_CFG_RC rc=TR_CFG_ERROR;
+
+  jhost=json_object_get(jporg, "hostname");
+  jport=json_object_get(jporg, "port");
+  jgss=json_object_get(jporg, "gss_names");
+
+  if ((jhost==NULL) || (!json_is_string(jhost))) {
+    tr_err("tr_cfg_parse_one_peer_org: hostname not specified or not a string.");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
   }
 
-  if (0 == strcmp(json_string_value(jscfg), "no")) {
-    idp->shared_config = 0;
-  } else {
-    idp->shared_config = 1;
+  if ((jport!=NULL) && (!json_is_number(jport))) {
+    /* note that not specifying the port is allowed, but if set it must be a number */
+    tr_err("tr_cfg_parse_one_peer_org: port is not a number.");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
+  }
+  
+  if ((jgss==NULL) || (!json_is_array(jgss))) {
+    tr_err("tr_cfg_parse_one_peer_org: gss_names not specified or not an array.");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
   }
 
-  if (NULL == (idp->realm_id = tr_new_name((char *)json_string_value(jrid)))) {
-    free(idp);
-    fprintf(stderr, "tr_cfg_parse_one_idp_realm: No memory for realm id.\n");
-    *rc = TR_CFG_NOMEM;
-    return NULL;
+  new_peer=trp_peer_new(tmp_ctx);
+  if (new_peer==NULL) {
+    tr_err("tr_cfg_parse_one_peer_org: could not allocate new peer.");
+    rc=TR_CFG_NOMEM;
+    goto cleanup;
   }
 
-  if (NULL == (idp->aaa_servers = tr_cfg_parse_aaa_servers(tr, jsrvrs, rc))) {
-    fprintf(stderr, "tr_cfg_parse_one_idp_realm: Can't parse AAA servers for realm %s.\n", idp->realm_id->buf);
-    tr_free_name(idp->realm_id);
-    free(idp);
-    return NULL;
+  trp_peer_set_server(new_peer, json_string_value(jhost));
+  if (jport==NULL)
+    trp_peer_set_port(new_peer, TRP_PORT);
+  else
+    trp_peer_set_port(new_peer, json_integer_value(jport));
+
+  names=tr_cfg_parse_gss_names(tmp_ctx, jgss, &rc);
+  if (rc!=TR_CFG_SUCCESS) {
+    tr_err("tr_cfg_parse_one_peer_org: unable to parse gss names.");
+    rc=TR_CFG_NOPARSE;
+    goto cleanup;
   }
+  trp_peer_set_gss_names(new_peer, names);
 
-  if ((NULL != (japcs = json_object_get(jidp, "apcs"))) &&
-      (json_is_array(japcs))) {
-    if (NULL == (idp->apcs = tr_cfg_parse_apcs(tr, japcs, rc))) {
-      fprintf(stderr, "tr_cfg_parse_one_idp_realm: Can't parse APCs for realm %s .\n", idp->realm_id->buf);
-      tr_free_name(idp->realm_id);
-      /* TBD -- free aaa_servers */;
-      free(idp);
-      return NULL;
-    }
-  } 
-  return idp;
+  /* success! */
+  trp_ptable_add(trc->peers, new_peer);
+  rc=TR_CFG_SUCCESS;
+
+ cleanup:
+  talloc_free(tmp_ctx);
+  return rc;
 }
 
-static TR_CFG_RC tr_cfg_parse_idp_realms (TR_INSTANCE *tr, json_t *jcfg) 
+/* Parse peer organizations, if present. Returns success if there are none. */
+static TR_CFG_RC tr_cfg_parse_peer_orgs(TR_CFG *trc, json_t *jcfg)
 {
-  json_t *jidps = NULL;
-  TR_CFG_RC rc = TR_CFG_SUCCESS;
-  TR_IDP_REALM *idp = NULL;
-  int i = 0;
+  json_t *jpeerorgs=NULL;
+  int ii=0;
 
-  if ((!tr) || (!tr->new_cfg) || (!jcfg))
-    return TR_CFG_BAD_PARAMS;
+  jpeerorgs=json_object_get(jcfg, "peer_organizations");
+  if (jpeerorgs==NULL)
+    return TR_CFG_SUCCESS;
 
-  if ((NULL == (jidps = json_object_get(jcfg, "idp_realms"))) ||
-      (!json_is_array(jidps))) {
+  if (!json_is_array(jpeerorgs)) {
+    tr_err("tr_cfg_parse_peer_orgs: peer_organizations is not an array.");
     return TR_CFG_NOPARSE;
   }
 
-  for (i = 0; i < json_array_size(jidps); i++) {
-    if (NULL == (idp = tr_cfg_parse_one_idp_realm(tr, 
-						  json_array_get(jidps, i), 
-						  &rc))) {
-       return rc;
+  for (ii=0; ii<json_array_size(jpeerorgs); ii++) {
+    if (tr_cfg_parse_one_peer_org(trc, json_array_get(jpeerorgs, ii))!=TR_CFG_SUCCESS) {
+      tr_err("tr_cfg_parse_peer_orgs: error parsing peer_organization %d.", ii+1);
+      return TR_CFG_NOPARSE;
     }
-    fprintf(stderr, "tr_cfg_parse_idp_realms: IDP realm configured: %s.\n", idp->realm_id->buf);
-    idp->next = tr->new_cfg->idp_realms;
-    tr->new_cfg->idp_realms = idp;
   }
+
+  return TR_CFG_SUCCESS;
+}
+             
+static TR_CFG_RC tr_cfg_parse_default_servers (TR_CFG *trc, json_t *jcfg) 
+{
+  json_t *jdss = NULL;
+  TR_CFG_RC rc = TR_CFG_SUCCESS;
+  TR_AAA_SERVER *ds = NULL;
+  int i = 0;
+
+  if ((!trc) || (!jcfg))
+    return TR_CFG_BAD_PARAMS;
+
+  /* If there are default servers, store them */
+  if ((NULL != (jdss = json_object_get(jcfg, "default_servers"))) &&
+      (json_is_array(jdss)) &&
+      (0 < json_array_size(jdss))) {
+
+    for (i = 0; i < json_array_size(jdss); i++) {
+      if (NULL == (ds = tr_cfg_parse_one_aaa_server(trc,
+                                                    json_array_get(jdss, i), 
+                                                   &rc))) {
+	return rc;
+      }
+      tr_debug("tr_cfg_parse_default_servers: Default server configured: %s", ds->hostname->buf);
+      ds->next = trc->default_servers;
+      trc->default_servers = ds;
+    }
+  } 
+
+  tr_debug("tr_cfg_parse_default_servers: Finished (rc=%d)", rc);
   return rc;
 }
 
-static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_INSTANCE *tr, json_t *jidps, TR_CFG_RC *rc)
+static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_CFG *trc, json_t *jidps, TR_CFG_RC *rc)
 {
   TR_IDP_REALM *idp = NULL;
+  TR_IDP_REALM *found_idp = NULL;
   TR_IDP_REALM *temp_idp = NULL;
   int i = 0;
 
-  if ((!tr) ||
+  if ((!trc) ||
       (!jidps) ||
       (!json_is_array(jidps))) {
     if (rc)
@@ -562,14 +1617,25 @@ static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_INSTANCE *tr, json_t *jidps, TR_
   }
 
   for (i = 0; i < json_array_size(jidps); i++) {
-    if (NULL == (temp_idp = (tr_cfg_find_idp(tr->new_cfg, 
-					     tr_new_name((char *)json_string_value(json_array_get(jidps, i))), 
-					     rc)))) {
-      fprintf(stderr, "tr_cfg_parse_comm_idps: Unknown IDP %s.\n", 
-	      (char *)json_string_value(json_array_get(jidps, i)));
+    if (NULL == (temp_idp = talloc(trc, TR_IDP_REALM))) {
+      tr_debug("tr_cfg_parse_comm_idps: Can't allocate memory for IdP Realm.");
+      if (rc)
+        *rc = TR_CFG_NOMEM;
+      return NULL;
+    }
+    memset (temp_idp, 0, sizeof(TR_IDP_REALM));
+    
+    if (NULL == (found_idp = (tr_cfg_find_idp(trc, 
+                                              tr_new_name((char *)json_string_value(json_array_get(jidps, i))), 
+                                              rc)))) {
+      tr_debug("tr_cfg_parse_comm_idps: Unknown IDP %s.", 
+               (char *)json_string_value(json_array_get(jidps, i)));
       return NULL;
     }
 
+    // We *MUST* do a dereferenced copy here or the second community will corrupt the linked list we create here.
+    *temp_idp = *found_idp;
+
     temp_idp->comm_next = idp;
     idp = temp_idp;
   }
@@ -577,13 +1643,13 @@ static TR_IDP_REALM *tr_cfg_parse_comm_idps (TR_INSTANCE *tr, json_t *jidps, TR_
   return idp;
 }
 
-static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_INSTANCE *tr, json_t *jrps, TR_CFG_RC *rc)
+static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_CFG *trc, json_t *jrps, TR_CFG_RC *rc)
 {
   TR_RP_REALM *rp = NULL;
   TR_RP_REALM *temp_rp = NULL;
   int i = 0;
 
-  if ((!tr) ||
+  if ((!trc) ||
       (!jrps) ||
       (!json_is_array(jrps))) {
     if (rc)
@@ -592,16 +1658,15 @@ static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_INSTANCE *tr, json_t *jrps, TR_CFG
   }
 
   for (i = (json_array_size(jrps)-1); i >= 0; i--) {
-    if (NULL == (temp_rp = malloc(sizeof(TR_RP_REALM)))) {
-      fprintf(stderr, "tr_cfg_parse_comm_rps: Can't allocate memory for RP Realm.\n");
+    if (NULL == (temp_rp = talloc_zero(trc, TR_RP_REALM))) {
+      tr_debug("tr_cfg_parse_comm_rps: Can't allocate memory for RP Realm.");
       if (rc)
 	*rc = TR_CFG_NOMEM;
       return NULL;
     }
-    memset (temp_rp, 0, sizeof(TR_RP_REALM));
 
     if (NULL == (temp_rp->realm_name = tr_new_name((char *)json_string_value(json_array_get(jrps, i))))) {
-      fprintf(stderr, "tr_cfg_parse_comm_rps: No memory for RP Realm Name.\n");
+      tr_debug("tr_cfg_parse_comm_rps: No memory for RP Realm Name.");
       if (rc)
 	*rc = TR_CFG_NOMEM;
       return NULL;
@@ -614,7 +1679,7 @@ static TR_RP_REALM *tr_cfg_parse_comm_rps (TR_INSTANCE *tr, json_t *jrps, TR_CFG
   return rp;
 }
 
-static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC *rc) {
+static TR_COMM *tr_cfg_parse_one_comm (TR_CFG *trc, json_t *jcomm, TR_CFG_RC *rc) {
   TR_COMM *comm = NULL;
   json_t *jid = NULL;
   json_t *jtype = NULL;
@@ -622,20 +1687,19 @@ static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC
   json_t *jidps = NULL;
   json_t *jrps = NULL;
 
-  if ((!jcomm) || (!rc)) {
-    fprintf(stderr, "tr_cfg_parse_one_comm: Bad parameters.\n");
+  if ((!trc) || (!jcomm) || (!rc)) {
+    tr_debug("tr_cfg_parse_one_comm: Bad parameters.");
     if (rc)
       *rc = TR_CFG_BAD_PARAMS;
     return NULL;
   }
 
-  if (NULL == (comm = malloc(sizeof(TR_COMM)))) {
-    fprintf(stderr, "tr_config_parse_one_comm: Out of memory.\n");
+  if (NULL == (comm = talloc_zero(trc, TR_COMM))) {
+    tr_crit("tr_cfg_parse_one_comm: Out of memory.");
     *rc = TR_CFG_NOMEM;
     return NULL;
   }
 
-  memset(comm, 0, sizeof(TR_COMM));
 
   if ((NULL == (jid = json_object_get(jcomm, "community_id"))) ||
       (!json_is_string(jid)) ||
@@ -647,15 +1711,13 @@ static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC
       (!json_is_array(jidps)) ||
       (NULL == (jrps = json_object_get(jcomm, "rp_realms"))) ||
       (!json_is_array(jrps))) {
-    fprintf(stderr, "tr_cfg_parse_one_comm: Error parsing Communities configuration.\n");
-    free(comm);
+    tr_debug("tr_cfg_parse_one_comm: Error parsing Communities configuration.");
     *rc = TR_CFG_NOPARSE;
     return NULL;
   }
 
   if (NULL == (comm->id = tr_new_name((char *)json_string_value(jid)))) {
-    free(comm);
-    fprintf(stderr, "tr_cfg_parse_one_comm: No memory for community id.\n");
+    tr_debug("tr_cfg_parse_one_comm: No memory for community id.");
     *rc = TR_CFG_NOMEM;
     return NULL;
   }
@@ -664,98 +1726,218 @@ static TR_COMM *tr_cfg_parse_one_comm (TR_INSTANCE *tr, json_t *jcomm, TR_CFG_RC
     comm->type = TR_COMM_APC;
   } else if (0 == strcmp(json_string_value(jtype), "coi")) {
     comm->type = TR_COMM_COI;
-    if (NULL == (comm->apcs = tr_cfg_parse_apcs(tr, japcs, rc))) {
-      fprintf(stderr, "tr_cfg_parse_one_comm: Can't parse APCs for COI %s.\n", comm->id->buf);
+    if (NULL == (comm->apcs = tr_cfg_parse_apcs(trc, japcs, rc))) {
+      tr_debug("tr_cfg_parse_one_comm: Can't parse APCs for COI %s.", comm->id->buf);
       tr_free_name(comm->id);
-      free(comm);
       return NULL;
     }
   } else {
-    fprintf(stderr, "tr_cfg_parse_one_comm: Invalid community type, comm = %s, type = %s\n", comm->id->buf, json_string_value(jtype));
+    tr_debug("tr_cfg_parse_one_comm: Invalid community type, comm = %s, type = %s", comm->id->buf, json_string_value(jtype));
     tr_free_name(comm->id);
-    free(comm);
     *rc = TR_CFG_NOPARSE;
     return NULL;
   }
 
-  comm->idp_realms = tr_cfg_parse_comm_idps(tr, jidps, rc);
+  comm->idp_realms = tr_cfg_parse_comm_idps(trc, jidps, rc);
   if (TR_CFG_SUCCESS != *rc) {
-    fprintf(stderr, "tr_cfg_parse_one_comm: Can't parse IDP realms for comm %s.\n", comm->id->buf);
+    tr_debug("tr_cfg_parse_one_comm: Can't parse IDP realms for comm %s.", comm->id->buf);
     tr_free_name(comm->id);
-    free(comm);
     return NULL;
   }
 
-  comm->rp_realms = tr_cfg_parse_comm_rps(tr, jrps, rc);
+  comm->rp_realms = tr_cfg_parse_comm_rps(trc, jrps, rc);
   if (TR_CFG_SUCCESS != *rc) {
-    fprintf(stderr, "tr_cfg_parse_comm: Can't parse RP realms for comm %s .\n", comm->id->buf);
+    tr_debug("tr_cfg_parse_comm: Can't parse RP realms for comm %s .", comm->id->buf);
     tr_free_name(comm->id);
-    /* TBD -- free idps? */;
-    free(comm);
     return NULL;
   }
 
+  if (TR_COMM_APC == comm->type) {
+    json_t *jexpire  = json_object_get(jcomm, "expiration_interval");
+    comm->expiration_interval = 43200; /*30 days*/
+    if (jexpire) {
+	if (!json_is_integer(jexpire)) {
+	  fprintf(stderr, "tr_parse_comm: expirae_interval is not an integer\n");
+	  return NULL;
+	}
+	comm->expiration_interval = json_integer_value(jexpire);
+	if (comm->expiration_interval <= 10)
+	  comm->expiration_interval = 11; /* Freeradius waits 10 minutes between successful TR queries*/
+	if (comm->expiration_interval > 129600) /* 90 days*/
+	comm->expiration_interval = 129600;
+    }
+  }
+  
   return comm;
 }
 
-static TR_CFG_RC tr_cfg_parse_comms (TR_INSTANCE *tr, json_t *jcfg) 
+static TR_CFG_RC tr_cfg_parse_comms (TR_CFG *trc, json_t *jcfg) 
 {
   json_t *jcomms = NULL;
   TR_CFG_RC rc = TR_CFG_SUCCESS;
   TR_COMM *comm = NULL;
   int i = 0;
 
-  if ((!tr) || (!tr->new_cfg) || (!jcfg)) {
-    fprintf(stderr, "tr_config_parse_comms: Bad Parameters.\n");
+  if ((!trc) || (!jcfg)) {
+    tr_debug("tr_cfg_parse_comms: Bad Parameters.");
     return TR_CFG_BAD_PARAMS;
   }
 
-  if (NULL == (comm = malloc(sizeof(TR_COMM)))) {
-    fprintf(stderr, "tr_cfg_parse_comms: Out of Memory\n");
-    return TR_CFG_NOMEM;
+  if (NULL != (jcomms = json_object_get(jcfg, "communities"))) {
+    if (!json_is_array(jcomms)) {
+      return TR_CFG_NOPARSE;
+    }
+
+    for (i = 0; i < json_array_size(jcomms); i++) {
+      if (NULL == (comm = tr_cfg_parse_one_comm(trc, 
+						json_array_get(jcomms, i), 
+						&rc))) {
+	return rc;
+      }
+      tr_debug("tr_cfg_parse_comms: Community configured: %s.", comm->id->buf);
+      comm->next = trc->comms;
+      trc->comms = comm;
+    }
   }
-  memset (comm, 0, sizeof(TR_COMM));
+  tr_debug("tr_cfg_parse_comms: Finished (rc=%d)", rc);
+  return rc;
+}
 
-  if ((NULL == (jcomms = json_object_get(jcfg, "communities"))) ||
-      (!json_is_array(jcomms))) {
-    return TR_CFG_NOPARSE;
+TR_CFG_RC tr_cfg_validate(TR_CFG *trc)
+{
+  TR_CFG_RC rc = TR_CFG_SUCCESS;
+
+  if (!trc)
+    return TR_CFG_BAD_PARAMS;
+
+  if ((NULL == trc->internal)||
+      (NULL == trc->internal->hostname)) {
+    tr_debug("tr_cfg_validate: Error: No internal configuration, or no hostname.");
+    rc = TR_CFG_ERROR;
   }
 
-  for (i = 0; i < json_array_size(jcomms); i++) {
-    if (NULL == (comm = tr_cfg_parse_one_comm(tr, 
-					      json_array_get(jcomms, i), 
-					      &rc))) {
-       return rc;
-    }
-    fprintf(stderr, "tr_cfg_parse_comms: Community configured: %s.\n", comm->id->buf);
-    comm->next = tr->new_cfg->comms;
-    tr->new_cfg->comms = comm;
+  if (NULL == trc->rp_clients) {
+    tr_debug("tr_cfg_validate: Error: No RP Clients configured");
+    rc = TR_CFG_ERROR;
+  }
+
+  if (NULL == trc->comms) {
+    tr_debug("tr_cfg_validate: Error: No Communities configured");
+    rc = TR_CFG_ERROR;
+  }
+
+  if ((NULL == trc->default_servers) && (NULL == trc->idp_realms)) {
+    tr_debug("tr_cfg_validate: Error: No default servers or IDPs configured.");
+    rc = TR_CFG_ERROR;
   }
+  
   return rc;
 }
 
-TR_CFG_RC tr_parse_config (TR_INSTANCE *tr, json_t *jcfg) {
+/* Join two paths and return a pointer to the result. This should be freed
+ * via talloc_free. Returns NULL on failure. */
+static char *join_paths(TALLOC_CTX *mem_ctx, const char *p1, const char *p2)
+{
+  return talloc_asprintf(mem_ctx, "%s/%s", p1, p2); /* returns NULL on a failure */
+}
+
+static void tr_cfg_log_json_error(const char *label, json_error_t *rc)
+{
+  tr_debug("%s: JSON parse error on line %d: %s",
+	   label,
+	   rc->line,
+	   rc->text);
+}
 
-  /* If there is a partial/abandoned config lying around, free it */
-  if (tr->new_cfg) {
-    tr_cfg_free(tr->new_cfg);
+TR_CFG_RC tr_cfg_parse_one_config_file(TR_CFG *cfg, const char *file_with_path)
+{
+  json_t *jcfg=NULL;
+  json_t *jser=NULL;
+  json_error_t rc;
+
+  if (NULL==(jcfg=json_load_file(file_with_path, 
+                                 JSON_DISABLE_EOF_CHECK, &rc))) {
+    tr_debug("tr_cfg_parse_one_config_file: Error parsing config file %s.", 
+             file_with_path);
+    tr_cfg_log_json_error("tr_cfg_parse_one_config_file", &rc);
+    return TR_CFG_NOPARSE;
   }
-  
-  if (NULL == (tr->new_cfg = malloc(sizeof(TR_CFG))))
-    return TR_CFG_NOMEM;
 
-  memset(tr->new_cfg, 0, sizeof(TR_CFG));
+  // Look for serial number and log it if it exists
+  if (NULL!=(jser=json_object_get(jcfg, "serial_number"))) {
+    if (json_is_number(jser)) {
+      tr_notice("tr_parse_one_config_file: Attempting to load revision %" JSON_INTEGER_FORMAT " of '%s'.",
+                json_integer_value(jser),
+                file_with_path);
+    }
+  }
 
-  if ((TR_CFG_SUCCESS != tr_cfg_parse_internal(tr, jcfg)) ||
-      (TR_CFG_SUCCESS != tr_cfg_parse_rp_clients(tr, jcfg)) ||
-      (TR_CFG_SUCCESS != tr_cfg_parse_idp_realms(tr, jcfg)) ||
-      (TR_CFG_SUCCESS != tr_cfg_parse_comms(tr, jcfg))) {
-    tr_cfg_free(tr->new_cfg);
+  if ((TR_CFG_SUCCESS != tr_cfg_parse_internal(cfg, jcfg)) ||
+      (TR_CFG_SUCCESS != tr_cfg_parse_local_orgs(cfg, jcfg)) ||
+      (TR_CFG_SUCCESS != tr_cfg_parse_peer_orgs(cfg, jcfg)) ||
+      (TR_CFG_SUCCESS != tr_cfg_parse_default_servers(cfg, jcfg)) ||
+      (TR_CFG_SUCCESS != tr_cfg_parse_comms(cfg, jcfg)))
     return TR_CFG_ERROR;
-  }
+
   return TR_CFG_SUCCESS;
 }
 
+/* Reads configuration files in config_dir ("" or "./" will use the current directory). */
+TR_CFG_RC tr_parse_config(TR_CFG_MGR *cfg_mgr, const char *config_dir, int n, struct dirent **cfg_files)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  char *file_with_path;
+  int ii;
+  TR_CFG_RC cfg_rc=TR_CFG_ERROR;
+
+  if ((!cfg_mgr) || (!cfg_files) || (n<=0)) {
+    cfg_rc=TR_CFG_BAD_PARAMS;
+    goto cleanup;
+  }
+
+  if (cfg_mgr->new != NULL)
+    tr_cfg_free(cfg_mgr->new);
+  cfg_mgr->new=tr_cfg_new(tmp_ctx); /* belongs to the temporary context for now */
+  if (cfg_mgr->new == NULL) {
+    cfg_rc=TR_CFG_NOMEM;
+    goto cleanup;
+  }
+
+  cfg_mgr->new->peers=trp_ptable_new(cfg_mgr);
+
+  /* Parse configuration information from each config file */
+  for (ii=0; ii<n; ii++) {
+    file_with_path=join_paths(tmp_ctx, config_dir, cfg_files[ii]->d_name); /* must free result with talloc_free */
+    if(file_with_path == NULL) {
+      tr_crit("tr_parse_config: error joining path.");
+      cfg_rc=TR_CFG_NOMEM;
+      goto cleanup;
+    }
+    tr_debug("tr_parse_config: Parsing %s.", cfg_files[ii]->d_name); /* print the filename without the path */
+    cfg_rc=tr_cfg_parse_one_config_file(cfg_mgr->new, file_with_path);
+    if (cfg_rc!=TR_CFG_SUCCESS) {
+      tr_crit("tr_parse_config: Error parsing %s", file_with_path);
+      goto cleanup;
+    }
+    talloc_free(file_with_path); /* done with filename */
+  }
+
+  /* make sure we got a complete, consistent configuration */
+  if (TR_CFG_SUCCESS != tr_cfg_validate(cfg_mgr->new)) {
+    tr_err("tr_parse_config: Error: INVALID CONFIGURATION");
+    cfg_rc=TR_CFG_ERROR;
+    goto cleanup;
+  }
+
+  /* success! */
+  talloc_steal(cfg_mgr, cfg_mgr->new); /* hand this over to the cfg_mgr context */
+  cfg_rc=TR_CFG_SUCCESS;
+
+cleanup:
+  talloc_free(tmp_ctx);
+  return cfg_rc;
+}
+
 TR_IDP_REALM *tr_cfg_find_idp (TR_CFG *tr_cfg, TR_NAME *idp_id, TR_CFG_RC *rc)
 {
 
@@ -769,7 +1951,7 @@ TR_IDP_REALM *tr_cfg_find_idp (TR_CFG *tr_cfg, TR_NAME *idp_id, TR_CFG_RC *rc)
 
   for (cfg_idp = tr_cfg->idp_realms; NULL != cfg_idp; cfg_idp = cfg_idp->next) {
     if (!tr_name_cmp (idp_id, cfg_idp->realm_id)) {
-      fprintf(stderr, "tr_cfg_find_idp: Found %s.\n", idp_id->buf);
+      tr_debug("tr_cfg_find_idp: Found %s.", idp_id->buf);
       return cfg_idp;
     }
   }
@@ -780,7 +1962,6 @@ TR_IDP_REALM *tr_cfg_find_idp (TR_CFG *tr_cfg, TR_NAME *idp_id, TR_CFG_RC *rc)
 TR_RP_CLIENT *tr_cfg_find_rp (TR_CFG *tr_cfg, TR_NAME *rp_gss, TR_CFG_RC *rc)
 {
   TR_RP_CLIENT *cfg_rp;
-  int i;
 
   if ((!tr_cfg) || (!rp_gss)) {
     if (rc)
@@ -789,54 +1970,35 @@ TR_RP_CLIENT *tr_cfg_find_rp (TR_CFG *tr_cfg, TR_NAME *rp_gss, TR_CFG_RC *rc)
   }
 
   for (cfg_rp = tr_cfg->rp_clients; NULL != cfg_rp; cfg_rp = cfg_rp->next) {
-    for (i = 0; i < TR_MAX_GSS_NAMES; i++) {
-      if (!tr_name_cmp (rp_gss, cfg_rp->gss_names[i])) {
-	fprintf(stderr, "tr_cfg_find_rp: Found %s.\n", rp_gss->buf);
-	return cfg_rp;
-      }
+    if (tr_gss_names_matches(cfg_rp->gss_names, rp_gss)) {
+      tr_debug("tr_cfg_find_rp: Found %s.", rp_gss->buf);
+      return cfg_rp;
     }
   }
   /* if we didn't find one, return NULL */ 
   return NULL;
 }
 
-json_t *tr_read_config (int n, struct dirent **cfg_files) {
-  json_t *jcfg = NULL;
-  json_t *temp = NULL;
-  json_error_t err;
-
-  if (!cfg_files)
-    return NULL;
+static int is_cfg_file(const struct dirent *dent) {
+  int n;
 
-  while (n--) {
-    fprintf(stderr, "tr_read_config: Parsing %s.\n", cfg_files[n]->d_name);
-    if (NULL == (temp = json_load_file(cfg_files[n]->d_name, JSON_DISABLE_EOF_CHECK, &err))) {
-      fprintf (stderr, "tr_read_config: Error parsing config file %s.\n", cfg_files[n]->d_name);
-      return NULL;
-    }
+  /* Only accept filenames ending in ".cfg" and starting with a character
+   * other than an ASCII '.' */
 
-    /* TBD -- instead of using json_object_update, iterate through files for non-overlap config? */
-    if (!jcfg) {
-      jcfg = temp;
-    }else {
-      if (-1 == json_object_update(jcfg, temp)) {
-	fprintf(stderr, "tr_read_config: Error merging config information.\n");
-	return NULL;
-      }
-    }
+  /* filename must be at least 4 characters long to be acceptable */
+  n=strlen(dent->d_name);
+  if (n < 4) {
+    return 0;
   }
 
-  //  fprintf(stderr, "tr_read_config: Merged configuration complete:\n%s\n", json_dumps(jcfg, 0));
-
-  return jcfg;
-}
-
-static int is_cfg_file(const struct dirent *dent) {
-  int n;
+  /* filename must not start with '.' */
+  if ('.' == dent->d_name[0]) {
+    return 0;
+  }
 
-  /* if the last four letters of the filename are .cfg, return true. */
-  if ((4 <= (n = strlen(dent->d_name))) &&
-      (0 == strcmp(&(dent->d_name[n-4]), ".cfg"))) {
+  /* If the above passed and the last four characters of the filename are .cfg, accept.
+   * (n.b., assumes an earlier test checked that the name is >= 4 chars long.) */
+  if (0 == strcmp(&(dent->d_name[n-4]), ".cfg")) {
     return 1;
   }
 
@@ -844,26 +2006,36 @@ static int is_cfg_file(const struct dirent *dent) {
   return 0;
 }
 
-int tr_find_config_files (struct dirent ***cfg_files) {
-  int n = 0, i = 0;
+/* Find configuration files in a particular directory. Returns the
+ * number of entries found, 0 if none are found, or <0 for some
+ * errors. If n>=0, the cfg_files parameter will contain a newly
+ * allocated array of pointers to struct dirent entries, as returned
+ * by scandir(). These can be freed with tr_free_config_file_list().
+ */
+int tr_find_config_files (const char *config_dir, struct dirent ***cfg_files) {
+  int n = 0;
   
-  n = scandir(".", cfg_files, &is_cfg_file, 0);
+  n = scandir(config_dir, cfg_files, is_cfg_file, alphasort);
 
   if (n < 0) {
     perror("scandir");
-    fprintf(stderr, "tr_find_config: scandir error.\n");
-    return 0;
-  }
+    tr_debug("tr_find_config: scandir error trying to scan %s.", config_dir);
+  } 
 
-  if (n == 0) {
-    fprintf (stderr, "tr_find_config: No config files found.\n");
-    return 0;
-  }
+  return n;
+}
 
-  i = n;
-  while(i--) {
-    fprintf(stderr, "tr_find_config: Config file found (%s).\n", (*cfg_files)[i]->d_name);
+/* Free memory allocated for configuration file list returned from tr_find_config_files().
+ * This can be called regardless of the return value of tr_find_config_values(). */
+void tr_free_config_file_list(int n, struct dirent ***cfg_files) {
+  int ii;
+
+  /* if n < 0, then scandir did not allocate anything because it failed */
+  if((n>=0) && (*cfg_files != NULL)) {
+    for(ii=0; ii<n; ii++) {
+      free((*cfg_files)[ii]);
+    }
+    free(*cfg_files); /* safe even if n==0 */
+    *cfg_files=NULL; /* this will help prevent accidentally freeing twice */
   }
-    
-  return n;
 }