]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
set and check request->root
authorAlan T. DeKok <aland@freeradius.org>
Wed, 26 May 2021 18:13:04 +0000 (14:13 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Wed, 26 May 2021 18:13:04 +0000 (14:13 -0400)
src/main/pair.c
src/main/process.c

index 030b905157c187748adc7b1d22fbaf39205eeb8f..2f736d74cf7ca2de6323fadae9780d2b8e3613c1 100644 (file)
@@ -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;
                }
index 6d1a67c1834dd2e29a52193f614d9eeadfa8134b..3096061d0a24624c8bed4d9c4dfad3ba978bec82 100644 (file)
@@ -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) {