From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 24 Mar 2025 05:08:53 +0000 (+0200)
Subject: move file to the dictionary directory
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f4f76b447b57bea558bfa36cc63d0ed18ab23b9;p=thirdparty%2Ffreeradius-server.git

move file to the dictionary directory

where it makes a bit more sense
---

diff --git a/scripts/upgrade/rewrite_attribute_names b/scripts/upgrade/rewrite_attribute_names
index 43551af3721..3e20c613b5e 100755
--- a/scripts/upgrade/rewrite_attribute_names
+++ b/scripts/upgrade/rewrite_attribute_names
@@ -32,7 +32,7 @@ my $dir;
 
 my  %v3_to_v4;
 
-our $opt_a = "alias.txt";
+our $opt_D = "./share/dictionary";
 our $opt_i = "";
 our $opt_o = "";
 
@@ -106,7 +106,10 @@ getopts('a:i:o:');
 #
 #  Read the alias mappings.
 #
-read_v4_alias($opt_a);
+my @protocols = ( "freeradius", "radius" );
+foreach (@protocols) {
+    read_v4_alias($opt_D . "/" . $_ . "/v3/upgrade.txt");
+}
 
 #
 #  Now that we have all of the attributes defined, let's process the input file.
diff --git a/share/dictionary/freeradius/v3/upgrade.txt b/share/dictionary/freeradius/v3/upgrade.txt
new file mode 100644
index 00000000000..585683a9372
--- /dev/null
+++ b/share/dictionary/freeradius/v3/upgrade.txt
@@ -0,0 +1,32 @@
+#
+#  Mapping of v3 names to v4 names
+#
+#  This file is used by the upgrade tool.
+#
+Cleartext-Password                      	Password.Cleartext
+Crypt-Password                          	Password.Crypt
+MD5-Password                            	Password.MD5
+NT-Password                             	Password.NT
+PBKDF2-Password                         	Password.PBKDF2
+Password-With-Header                    	Password.With-Header
+SHA1-Password                           	Password.SHA1
+SHA2-224-Password                       	Password.SHA2-224
+SHA2-256-Password                       	Password.SHA2-256
+SHA2-384-Password                       	Password.SHA2-384
+SHA2-512-Password                       	Password.SHA2-512
+SHA2-Password                           	Password.SHA2
+SHA3-224-Password                       	Password.SHA3-224
+SHA3-256-Password                       	Password.SHA3-256
+SHA3-384-Password                       	Password.SHA3-384
+SHA3-512-Password                       	Password.SHA3-512
+SHA3-Password                           	Password.SHA3
+SMD5-Password                           	Password.SMD5
+SSHA1-Password                          	Password.SSHA1
+SSHA2-224-Password                      	Password.SSHA2-224
+SSHA2-256-Password                      	Password.SSHA2-256
+SSHA2-384-Password                      	Password.SSHA2-384
+SSHA2-512-Password                      	Password.SSHA2-512
+SSHA3-224-Password                      	Password.SSHA3-224
+SSHA3-256-Password                      	Password.SSHA3-256
+SSHA3-384-Password                      	Password.SSHA3-384
+SSHA3-512-Password                      	Password.SSHA3-512
diff --git a/scripts/upgrade/alias.txt b/share/dictionary/radius/v3/upgrade.txt
similarity index 99%
rename from scripts/upgrade/alias.txt
rename to share/dictionary/radius/v3/upgrade.txt
index a259875a203..e7222ef204b 100644
--- a/scripts/upgrade/alias.txt
+++ b/share/dictionary/radius/v3/upgrade.txt
@@ -1,36 +1,7 @@
 #
-#  Internal attributes
+#  Mapping of v3 names to v4 names
 #
-Cleartext-Password                      	Password.Cleartext
-Crypt-Password                          	Password.Crypt
-MD5-Password                            	Password.MD5
-NT-Password                             	Password.NT
-PBKDF2-Password                         	Password.PBKDF2
-Password-With-Header                    	Password.With-Header
-SHA1-Password                           	Password.SHA1
-SHA2-224-Password                       	Password.SHA2-224
-SHA2-256-Password                       	Password.SHA2-256
-SHA2-384-Password                       	Password.SHA2-384
-SHA2-512-Password                       	Password.SHA2-512
-SHA2-Password                           	Password.SHA2
-SHA3-224-Password                       	Password.SHA3-224
-SHA3-256-Password                       	Password.SHA3-256
-SHA3-384-Password                       	Password.SHA3-384
-SHA3-512-Password                       	Password.SHA3-512
-SHA3-Password                           	Password.SHA3
-SMD5-Password                           	Password.SMD5
-SSHA1-Password                          	Password.SSHA1
-SSHA2-224-Password                      	Password.SSHA2-224
-SSHA2-256-Password                      	Password.SSHA2-256
-SSHA2-384-Password                      	Password.SSHA2-384
-SSHA2-512-Password                      	Password.SSHA2-512
-SSHA3-224-Password                      	Password.SSHA3-224
-SSHA3-256-Password                      	Password.SSHA3-256
-SSHA3-384-Password                      	Password.SSHA3-384
-SSHA3-512-Password                      	Password.SSHA3-512
-
-#
-#  RADIUS VSAs
+#  This file is used by the upgrade tool.
 #
 3Com-Connect_Id                         	Vendor-Specific.3com.Connect_Id
 3Com-Encryption-Type                    	Vendor-Specific.3com.Encryption-Type