Merge pull request #92 from painless-security/jennifer/reduce_logging

[trust_router.git] / common / tr_config.c

diff --git a/common/tr_config.c b/common/tr_config.c
index 2ddda12..e0becec 100644 (file)
--- a/common/tr_config.c
+++ b/common/tr_config.c
@@ -195,11 +195,10 @@ TR_CFG_RC tr_cfg_validate(TR_CFG *trc)
   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.");
+  /* validate the internal config - error messages will be generated there, so don't genreate
+   * our own */
+  if (tr_cfg_validate_internal(trc->internal) != TR_CFG_SUCCESS)
     rc = TR_CFG_ERROR;
-  }
 
   if (NULL == trc->rp_clients) {
     tr_debug("tr_cfg_validate: Error: No RP Clients configured");