Rename dpair_legacy.c to pair_legacy.c

diff --git a/src/lib/server/exec.c b/src/lib/server/exec.c
index 861465a9e72aaeb171e46498d63a53d8adec15be..e50353f3c4e774bf500a1fb43c34869f6d59358d 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 3df2729936e95ce7f22629671762a3b58c26f818..d70cae6864625a63c9c68531c8d1c652b828fd0d 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -34,8 +34,8 @@ 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/pair_legacy.h>
 #include <freeradius-devel/util/misc.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>

diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 9c1e00494e14277013186f652e7ab895a8649181..5f6584c1a70660f2f9e7a7744328f834cf4d6ab2 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 70107bd040092a4b77c8b4677d237050d99c01e1..cc8689800c78263dbecfffa7324cf10ff19417ad 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 2f83b4aa2822cc41bc9e5a34fc0913fdb624d755..b805bb089e36a7e1dfa83ceda50148fcd30e433e 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 e63b31000e606f211f2f01735325b1f08e17501b..59ba921a08f1069f584ce4b41a362d367d42597a 100644 (file)
--- a/src/lib/util/base.h
+++ b/src/lib/util/base.h
@@ -41,7 +41,6 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/dns.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>
@@ -56,6 +55,7 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/pair.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/libfreeradius-util.mk b/src/lib/util/libfreeradius-util.mk
index de1290bba71124d4bc5d34f481bbb2252c86821a..c536d50afe105d12f657ded22d480a3ee133f2d5 100644 (file)
--- a/src/lib/util/libfreeradius-util.mk
+++ b/src/lib/util/libfreeradius-util.mk
@@ -20,7 +20,6 @@ SOURCES               := \
                   dict_util.c \
                   dict_validate.c \
                   dl.c \
-                  dpair_legacy.c \
                   dns.c \
                   event.c \
                   ext.c \
@@ -45,6 +44,7 @@ SOURCES               := \
                   net.c \
                   packet.c \
                   pair.c \
+                  pair_legacy.c \
                   pair_print.c \
                   pair_tokenize.c \
                   paths.c \

diff --git a/src/lib/util/dpair_legacy.c b/src/lib/util/pair_legacy.c
similarity index 99%
rename from src/lib/util/dpair_legacy.c
rename to src/lib/util/pair_legacy.c
index bfd46ecbd70264f4a69f1cbdcb86487d3408e72f..09fba5b3a6a691b6b9e73cc9b8d36fd510ac3f58 100644 (file)
--- a/src/lib/util/dpair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -22,8 +22,8 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/dpair.h>
-#include <freeradius-devel/util/dpair_legacy.h>
+#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>

diff --git a/src/lib/util/dpair_legacy.h b/src/lib/util/pair_legacy.h
similarity index 97%
rename from src/lib/util/dpair_legacy.h
rename to src/lib/util/pair_legacy.h
index c4e622209c071e5d79459de9d278b0390463b2a5..6db7437b992dcd7d53da929f0878c24eda41d9e3 100644 (file)
--- a/src/lib/util/dpair_legacy.h
+++ b/src/lib/util/pair_legacy.h
@@ -26,7 +26,7 @@ RCSIDH(pair_legacy_h, "$Id$")
 #include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/dcursor.h>
-#include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/token.h>
 

diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c
index 8462bf1c3e73c4957709695780f6eb6a3bbb3b4f..f4156186f7e3e6c6a6314340f8b9db15742c841c 100644 (file)
--- a/src/lib/util/pair_legacy_tests.c
+++ b/src/lib/util/pair_legacy_tests.c
@@ -43,8 +43,8 @@ static void pair_tests_init(void);
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/dpair_legacy.h>
 #include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/radius/radius.h>