From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 5 Nov 2021 13:49:37 +0000 (-0400)
Subject: Pass dict root not dicts...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1503b48d7dfd64c303f7db9b9872f16f54bb7fdb;p=thirdparty%2Ffreeradius-server.git

Pass dict root not dicts...
---

diff --git a/src/process/arp/base.c b/src/process/arp/base.c
index cc1826f9cd3..b3e4d8eb2fa 100644
--- a/src/process/arp/base.c
+++ b/src/process/arp/base.c
@@ -172,7 +172,7 @@ static void arp_packet_debug(request_t *request, fr_radius_packet_t const *packe
 	if (received || request->parent) {
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
 	} else {
-		log_request_proto_pair_list(L_DBG_LVL_1, request, dict_arp, list, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, fr_dict_root(dict_arp), list, NULL);
 	}
 }
 
diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index 10cd548451f..6ecd8929868 100644
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -104,7 +104,7 @@ static void dhcpv4_packet_debug(request_t *request, fr_radius_packet_t *packet,
 	if (received || request->parent) {
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
 	} else {
-		log_request_proto_pair_list(L_DBG_LVL_1, request, dict_dhcpv4, list, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, fr_dict_root(dict_dhcpv4), list, NULL);
 	}
 }
 
diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index ed0bc9a0cfe..67e799f462a 100644
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -190,7 +190,7 @@ static void dhcpv6_packet_debug(request_t *request, fr_radius_packet_t const *pa
 	if (received || request->parent) {
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
 	} else {
-		log_request_proto_pair_list(L_DBG_LVL_1, request, dict_dhcpv6, list, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, fr_dict_root(dict_dhcpv6), list, NULL);
 	}
 
 	request->module = module;
diff --git a/src/process/dns/base.c b/src/process/dns/base.c
index 1926e374ded..a0d31ad5570 100644
--- a/src/process/dns/base.c
+++ b/src/process/dns/base.c
@@ -139,7 +139,7 @@ static void dns_packet_debug(request_t *request, fr_radius_packet_t const *packe
 	if (received || request->parent) {
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
 	} else {
-		log_request_proto_pair_list(L_DBG_LVL_1, request, dict_dns, list, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, fr_dict_root(dict_dns), list, NULL);
 	}
 }
 
diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 429f95cdab3..91317ce5203 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -229,7 +229,7 @@ static void radius_packet_debug(request_t *request, fr_radius_packet_t *packet,
 	if (received || request->parent) {
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
 	} else {
-		log_request_proto_pair_list(L_DBG_LVL_1, request, dict_radius, list, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, fr_dict_root(dict_radius), list, NULL);
 	}
 }
 
diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c
index 4587c1eba4f..730601ff02d 100644
--- a/src/process/vmps/base.c
+++ b/src/process/vmps/base.c
@@ -197,7 +197,7 @@ static void vmps_packet_debug(request_t *request, fr_radius_packet_t const *pack
 	if (received || request->parent) {
 		log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
 	} else {
-		log_request_proto_pair_list(L_DBG_LVL_1, request, dict_vmps, list, NULL);
+		log_request_proto_pair_list(L_DBG_LVL_1, request, fr_dict_root(dict_vmps), list, NULL);
 	}
 }