Merge pull request #100 from painless-security/milestone/monitoring

[trust_router.git] / common / tr_config_realms.c

diff --git a/common/tr_config_realms.c b/common/tr_config_realms.c
index cd8f660..3c189ee 100644 (file)
--- a/common/tr_config_realms.c
+++ b/common/tr_config_realms.c
@@ -72,14 +72,16 @@ TR_AAA_SERVER *tr_cfg_parse_one_aaa_server(TALLOC_CTX *mem_ctx, json_t *jaddr, T
   }
 
   if (tr_aaa_server_get_hostname(aaa)->len == 0) {
-    tr_debug("tr_cfg_parse_one_aaa_server: Empty hostname for AAA server not allowed");
+    tr_debug("tr_cfg_parse_one_aaa_server: Invalid hostname for AAA server (%s)",
+             json_string_value(jaddr));
     *rc = TR_CFG_NOPARSE;
     goto cleanup;
   }
 
   if ((tr_aaa_server_get_port(aaa) <= 0)
       || (tr_aaa_server_get_port(aaa) > 65535)) {
-    tr_debug("tr_cfg_parse_one_aaa_server: Invalid AAA server port");
+    tr_debug("tr_cfg_parse_one_aaa_server: Invalid AAA server port (%s)",
+             json_string_value(jaddr));
     *rc = TR_CFG_NOPARSE;
     goto cleanup;
   }
@@ -185,6 +187,9 @@ TR_APC *tr_cfg_parse_apcs(TALLOC_CTX *mem_ctx, json_t *japcs, TR_CFG_RC *rc)
   *rc=TR_CFG_SUCCESS;
 
 cleanup:
+  if (*rc != TR_CFG_SUCCESS)
+    apcs = NULL;
+
   talloc_free(tmp_ctx);
   return apcs;
 }