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 e50353f3c4e774bf500a1fb43c34869f6d59358d..861465a9e72aaeb171e46498d63a53d8adec15be 100644 (file)
--- 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 9c9768e412cbaead7b978cc6b1b3186692537c42..3df2729936e95ce7f22629671762a3b58c26f818 100644 (file)
--- 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 5f6584c1a70660f2f9e7a7744328f834cf4d6ab2..9c1e00494e14277013186f652e7ab895a8649181 100644 (file)
--- 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 cc8689800c78263dbecfffa7324cf10ff19417ad..70107bd040092a4b77c8b4677d237050d99c01e1 100644 (file)
--- 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 b805bb089e36a7e1dfa83ceda50148fcd30e433e..2f83b4aa2822cc41bc9e5a34fc0913fdb624d755 100644 (file)
--- 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 840050cae8cc2891b45e092e3a619b3b3d951f02..52d47e6993df25a5a122bc04066f1ae9b8bb42e7 100644 (file)
--- 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 923a28eff8aefa274cb63d0c1e7098453b12d751..bfd46ecbd70264f4a69f1cbdcb86487d3408e72f 100644 (file)
--- 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 b13cd0c49551c5d481ef705752aff9502df9e6d2..8c6eac51b56f2f4d787ecb33ff52f7e3c9d25bed 100644 (file)
--- 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>