Clean up compiler warnings (and likely bugs).

diff --git a/common/tr_filter.c b/common/tr_filter.c
index 5c09fa9..ae26c38 100644 (file)
--- a/common/tr_filter.c
+++ b/common/tr_filter.c
@@ -83,9 +83,9 @@ int tr_filter_process_rp_permitted (TR_NAME *rp_realm, TR_FILTER *rpp_filter, TR
   /* Check if there is a match for this filter. */
   for (i = 0; i < TR_MAX_FILTER_LINES; i++) {
     for (j = 0; j < TR_MAX_FILTER_SPECS; j++) {
-      if (tr_prefix_wildcard_match(rp_realm->buf, rpp_filter->lines[i]->specs[j]->match)) {
+      if (tr_prefix_wildcard_match(rp_realm->buf, rpp_filter->lines[i]->specs[j]->match->buf)) {
        *out_action = rpp_filter->lines[i]->action;
-       *out_constraints = &(rpp_filter->lines[i]->constraints);
+       *out_constraints = rpp_filter->lines[i]->constraints;
        return TR_FILTER_MATCH;
       }
     }

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 70d8b06..7dc7cab 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -78,7 +78,7 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
   TID_REQ *fwd_req = NULL;
   TR_COMM *cfg_comm = NULL;
   TR_COMM *cfg_apc = NULL;
-  TR_CONSTRAINT *ocons = NULL;
+  TR_CONSTRAINT_SET *ocons = NULL;
   int oaction = TR_FILTER_ACTION_REJECT;
   int rc = 0;
 
@@ -116,7 +116,7 @@ static int tr_tids_req_handler (TIDS_INSTANCE *tids,
 
   if ((TR_FILTER_NO_MATCH == tr_filter_process_rp_permitted(orig_req->rp_realm, ((TR_INSTANCE *)tr)->rp_gss->filter, NULL, &ocons, &oaction)) ||
       (TR_FILTER_ACTION_REJECT == oaction)) {
-    fprintf(stderr, "tr_tids_req_handler: RP realm (%s) does not match RP Realm filter for GSS name\n");
+    fprintf(stderr, "tr_tids_req_handler: RP realm (%s) does not match RP Realm filter for GSS name\n", orig_req->rp_realm->buf);
     tids_send_err_response(tids, orig_req, "RP Realm filter error");
   }