Merge branch 'jennifer/filter-dev' into debian-testing

diff --git a/common/tr_config.c b/common/tr_config.c
index 4fa6506..d48902b 100644 (file)
--- a/common/tr_config.c
+++ b/common/tr_config.c
@@ -2088,7 +2088,7 @@ TR_CFG_RC tr_parse_config(TR_CFG_MGR *cfg_mgr, const char *config_dir, int n, st
     goto cleanup;
   }
 
-  cfg_mgr->new->peers=trp_ptable_new(cfg_mgr);
+  cfg_mgr->new->peers=trp_ptable_new(cfg_mgr); /* not sure why this isn't in cfg_mgr->new's context */
 
   /* Parse configuration information from each config file */
   for (ii=0; ii<n; ii++) {

diff --git a/common/tr_idp.c b/common/tr_idp.c
index 10bb2c3..f6c0836 100644 (file)
--- a/common/tr_idp.c
+++ b/common/tr_idp.c
@@ -139,6 +139,7 @@ TR_IDP_REALM *tr_idp_realm_new(TALLOC_CTX *mem_ctx)
     idp->aaa_servers=NULL;
     idp->apcs=NULL;
     idp->origin=TR_REALM_LOCAL;
+    idp->refcount=0;
     talloc_set_destructor((void *)idp, tr_idp_realm_destructor);
   }
   return idp;

diff --git a/redhat/default-internal.cfg b/redhat/default-internal.cfg
index 7bfe0f5..eef0f61 100644 (file)
--- a/redhat/default-internal.cfg
+++ b/redhat/default-internal.cfg
@@ -2,8 +2,8 @@
   "tr_internal": {
     "max_tree_depth": 12,
     "hostname":"beta.example.com",
-    "trps_port":25308,
-    "tids_port":25309,
+    "trps_port":12308,
+    "tids_port":12309,
     "cfg_poll_interval": 1,
     "cfg_settling_time": 5,
     "trp_sweep_interval": 30,