From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 26 May 2021 18:13:04 +0000 (-0400)
Subject: set and check request->root
X-Git-Tag: release_3_0_23~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71f8e7597e4335b3668abfbbaff2dae581111335;p=thirdparty%2Ffreeradius-server.git

set and check request->root
---

diff --git a/src/main/pair.c b/src/main/pair.c
index 030b905157c..2f736d74cf7 100644
--- a/src/main/pair.c
+++ b/src/main/pair.c
@@ -742,7 +742,7 @@ void rdebug_pair(log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char const *
 
 	if (!radlog_debug_enabled(L_DBG, level, request)) return;
 
-	if (vp->da->flags.secret && request->root->suppress_secrets && (rad_debug_lvl < 3)) {
+	if (vp->da->flags.secret && request->root && request->root->suppress_secrets && (rad_debug_lvl < 3)) {
 		RDEBUGX(level, "%s%s = <<< secret >>>", prefix ? prefix : "", vp->da->name);
 		return;
 	}
@@ -772,7 +772,7 @@ void rdebug_pair_list(log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char co
 	     vp = fr_cursor_next(&cursor)) {
 		VERIFY_VP(vp);
 
-		if (vp->da->flags.secret && request->root->suppress_secrets && (rad_debug_lvl < 3)) {
+		if (vp->da->flags.secret && request->root && request->root->suppress_secrets && (rad_debug_lvl < 3)) {
 			RDEBUGX(level, "%s%s = <<< secret >>>", prefix ? prefix : "", vp->da->name);
 			continue;
 		}
@@ -805,7 +805,7 @@ void rdebug_proto_pair_list(log_lvl_t level, REQUEST *request, VALUE_PAIR *vp)
 		if ((vp->da->vendor == 0) &&
 		    ((vp->da->attr & 0xFFFF) > 0xff)) continue;
 
-		if (vp->da->flags.secret && request->root->suppress_secrets && (rad_debug_lvl < 3)) {
+		if (vp->da->flags.secret && request->root && request->root->suppress_secrets && (rad_debug_lvl < 3)) {
 			RDEBUGX(level, "%s = <<< secret >>>", vp->da->name);
 			continue;
 		}
diff --git a/src/main/process.c b/src/main/process.c
index 6d1a67c1834..3096061d0a2 100644
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -3720,6 +3720,7 @@ static void ping_home_server(void *ctx)
 	NO_CHILD_THREAD;
 
 	request->proxy = rad_alloc(request, true);
+	request->root = &main_config;
 	rad_assert(request->proxy != NULL);
 
 	if (home->ping_check == HOME_PING_CHECK_STATUS_SERVER) {