From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 25 Jan 2021 10:30:47 +0000 (+0000)
Subject: Replace util/pair_legacy.h with util/dpair_legacy.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1154c72d3685dd0e4f3ea6dd9587d6bdbccc83d6;p=thirdparty%2Ffreeradius-server.git

Replace util/pair_legacy.h with util/dpair_legacy.h
---

diff --git a/src/lib/server/exec.c b/src/lib/server/exec.c
index e50353f3c4..861465a9e7 100644
--- a/src/lib/server/exec.c
+++ b/src/lib/server/exec.c
@@ -30,8 +30,8 @@ RCSID("$Id$")
 #include <freeradius-devel/server/util.h>
 
 #include <freeradius-devel/util/dlist.h>
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/thread_local.h>
 
diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index 9c9768e412..3df2729936 100644
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -34,9 +34,9 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond.h>
 
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/hex.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair_legacy.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 5f6584c1a7..9c1e00494e 100644
--- a/src/lib/server/map_async.c
+++ b/src/lib/server/map_async.c
@@ -33,8 +33,8 @@ RCSID("$Id$")
 #include <freeradius-devel/server/paircmp.h>
 #include <freeradius-devel/util/debug.h>
 
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair_legacy.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
diff --git a/src/lib/server/users_file.c b/src/lib/server/users_file.c
index cc8689800c..70107bd040 100644
--- a/src/lib/server/users_file.c
+++ b/src/lib/server/users_file.c
@@ -28,8 +28,8 @@ RCSID("$Id$")
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/users_file.h>
 
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/syserror.h>
 
 #include <sys/stat.h>
diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index b805bb089e..2f83b4aa28 100644
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -31,9 +31,9 @@
 #include <freeradius-devel/server/pair.h>
 
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/hex.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair_legacy.h>
 
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
diff --git a/src/lib/util/base.h b/src/lib/util/base.h
index 840050cae8..52d47e6993 100644
--- a/src/lib/util/base.h
+++ b/src/lib/util/base.h
@@ -41,6 +41,7 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/dns.h>
 #include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/fifo.h>
 #include <freeradius-devel/util/file.h>
@@ -54,7 +55,6 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/md4.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/packet.h>
-#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/rand.h>
diff --git a/src/lib/util/dpair_legacy.c b/src/lib/util/dpair_legacy.c
index 923a28eff8..bfd46ecbd7 100644
--- a/src/lib/util/dpair_legacy.c
+++ b/src/lib/util/dpair_legacy.c
@@ -23,8 +23,8 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>
diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c
index b13cd0c495..8c6eac51b5 100644
--- a/src/lib/util/pair_legacy_tests.c
+++ b/src/lib/util/pair_legacy_tests.c
@@ -44,7 +44,7 @@ static void pair_tests_init(void);
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/dpair.h>
-#include <freeradius-devel/util/pair_legacy.h>
+#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/radius/radius.h>