Fixup autoloader definitions

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index b083f9889bac1af485cedd6abe718efc7d88fedf..3dc197588873ada3142f874749eb0fec1f4ae3c9 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -112,7 +112,7 @@ static fr_dict_attr_t const *attr_user_password;
 
 extern fr_dict_attr_autoload_t radclient_dict_attr[];
 fr_dict_attr_autoload_t radclient_dict_attr[] = {
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_ms_chap_challenge, .name = "MS-CHAP-Challenge", .type = FR_TYPE_OCTETS, .dict = &dict_radius },
        { .out = &attr_ms_chap_password, .name = "MS-CHAP-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_ms_chap_response, .name = "MS-CHAP-Response", .type = FR_TYPE_OCTETS, .dict = &dict_radius },

diff --git a/src/bin/radclient.h b/src/bin/radclient.h
index 95edef6b448eed10f01cf76d23c0647137080ed2..a623600d532d4d7b1003535e00d1949c3653a6fe 100644 (file)
--- a/src/bin/radclient.h
+++ b/src/bin/radclient.h
@@ -74,7 +74,7 @@ struct rc_request {
 
        rc_file_pair_t  *files;         //!< Request and response file names.
 
-       fr_pair_t       *password;      //!< Cleartext-Password
+       fr_pair_t       *password;      //!< Password.Cleartext
        fr_time_delta_t timestamp;
 
        fr_radius_packet_t      *packet;        //!< The outgoing request.

diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c
index 7522b4b5fad7b7d80ca5db68b3d5495049c8ec5f..1edbd27183846940151613fd4cdd071ca63f17db 100644 (file)
--- a/src/lib/server/paircmp.c
+++ b/src/lib/server/paircmp.c
@@ -81,7 +81,7 @@ static fr_dict_attr_t const *attr_virtual_server;
 extern fr_dict_attr_autoload_t paircmp_dict_attr[];
 fr_dict_attr_autoload_t paircmp_dict_attr[] = {
        { .out = &attr_client_ip_address, .name = "Client-IP-Address", .type = FR_TYPE_IPV4_ADDR, .dict = &dict_freeradius },
-       { .out = &attr_crypt_password, .name = "Crypt-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_crypt_password, .name = "Password.Crypt", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_packet_dst_ip_address, .name = "Packet-Dst-IP-Address", .type = FR_TYPE_IPV4_ADDR, .dict = &dict_freeradius },
        { .out = &attr_packet_dst_ipv6_address, .name = "Packet-Dst-IPv6-Address", .type = FR_TYPE_IPV6_ADDR, .dict = &dict_freeradius },
        { .out = &attr_packet_dst_port, .name = "Packet-Dst-Port", .type = FR_TYPE_UINT16, .dict = &dict_freeradius },
@@ -592,7 +592,7 @@ int paircmp(request_t *request,
                if (check_item->da == attr_user_password) {
                        if (check_item->op == T_OP_CMP_EQ) {
                                WARN("Found User-Password == \"...\"");
-                               WARN("Are you sure you don't mean Cleartext-Password?");
+                               WARN("Are you sure you don't mean Password.Cleartext?");
                                WARN("See \"man rlm_pap\" for more information");
                        }
                        if (fr_pair_find_by_num(&request_list, 0, FR_USER_PASSWORD) == NULL) continue;

diff --git a/src/lib/server/password.c b/src/lib/server/password.c
index 5fa87ef86f4765f007db48d76ac445147d9aa373..5612bc633b41928df07241c873c917d7d0b004fb 100644 (file)
--- a/src/lib/server/password.c
+++ b/src/lib/server/password.c
@@ -123,42 +123,42 @@ fr_dict_autoload_t password_dict[] = {
 
 extern fr_dict_attr_autoload_t password_dict_attr[];
 fr_dict_attr_autoload_t password_dict_attr[] = {
-       { .out = &attr_cleartext, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
-       { .out = &attr_with_header, .name = "Password-With-Header", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
-       { .out = &attr_root, .name = "Password-Root", .type = FR_TYPE_TLV, .dict = &dict_freeradius },
-
-       { .out = &attr_md5, .name = "MD5-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_smd5, .name = "SMD5-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_crypt, .name = "Crypt-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
-       { .out = &attr_sha1, .name = "SHA1-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha1, .name = "SSHA1-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-
-       { .out = &attr_sha2, .name = "SHA2-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha2_224, .name = "SHA2-224-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha2_256, .name = "SHA2-256-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha2_384, .name = "SHA2-384-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha2_512, .name = "SHA2-512-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-
-       { .out = &attr_ssha2_224, .name = "SSHA2-224-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha2_256, .name = "SSHA2-256-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha2_384, .name = "SSHA2-384-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha2_512, .name = "SSHA2-512-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-
-       { .out = &attr_sha3, .name = "SHA3-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha3_224, .name = "SHA3-224-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha3_256, .name = "SHA3-256-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha3_384, .name = "SHA3-384-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_sha3_512, .name = "SHA3-512-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-
-       { .out = &attr_ssha3_224, .name = "SSHA3-224-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha3_256, .name = "SSHA3-256-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha3_384, .name = "SSHA3-384-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ssha3_512, .name = "SSHA3-512-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-
-       { .out = &attr_pbkdf2, .name = "PBKDF2-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_lm, .name = "LM-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_nt, .name = "NT-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_ns_mta_md5, .name = "NS-MTA-MD5-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_with_header, .name = "Password.With-Header", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_root, .name = "Password", .type = FR_TYPE_TLV, .dict = &dict_freeradius },
+
+       { .out = &attr_md5, .name = "Password.MD5", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_smd5, .name = "Password.SMD5", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_crypt, .name = "Password.Crypt", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_sha1, .name = "Password.SHA1", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha1, .name = "Password.SSHA1", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+
+       { .out = &attr_sha2, .name = "Password.SHA2", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha2_224, .name = "Password.SHA2-224", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha2_256, .name = "Password.SHA2-256", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha2_384, .name = "Password.SHA2-384", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha2_512, .name = "Password.SHA2-512", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+
+       { .out = &attr_ssha2_224, .name = "Password.SSHA2-224", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha2_256, .name = "Password.SSHA2-256", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha2_384, .name = "Password.SSHA2-384", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha2_512, .name = "Password.SSHA2-512", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+
+       { .out = &attr_sha3, .name = "Password.SHA3", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha3_224, .name = "Password.SHA3-224", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha3_256, .name = "Password.SHA3-256", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha3_384, .name = "Password.SHA3-384", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_sha3_512, .name = "Password.SHA3-512", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+
+       { .out = &attr_ssha3_224, .name = "Password.SSHA3-224", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha3_256, .name = "Password.SSHA3-256", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha3_384, .name = "Password.SSHA3-384", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ssha3_512, .name = "Password.SSHA3-512", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+
+       { .out = &attr_pbkdf2, .name = "Password.PBKDF2", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_lm, .name = "Password.LM", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_nt, .name = "Password.NT", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+       { .out = &attr_ns_mta_md5, .name = "Password.NS-MTA-MD5", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 
        { .out = &attr_user, .name = "User-Password", .type = FR_TYPE_STRING, .dict = &dict_radius },
 
@@ -603,7 +603,7 @@ static fr_pair_t *password_process_sha3(TALLOC_CTX *ctx, request_t *request, fr_
 #  endif
 #endif
 
-/** Convert a Password-With-Header attribute to the correct type
+/** Convert a Password.With-Header attribute to the correct type
  *
  * Attribute may be base64 encoded, in which case it will be decoded
  * first, then evaluated.
@@ -613,7 +613,7 @@ static fr_pair_t *password_process_sha3(TALLOC_CTX *ctx, request_t *request, fr_
  *
  * @param[in] ctx              to allocate new pairs in.
  * @param[in] request          Current request.
- * @param[in] known_good       Password-With-Header attribute to convert.
+ * @param[in] known_good       Password.With-Header attribute to convert.
  * @return
  *     - Buffer containing normified value on success.
  *     - NULL on error.
@@ -717,7 +717,7 @@ do_header:
                                known_good->vp_length, decoded);
 
                        /*
-                        *      Password-With-Header is a string attribute.
+                        *      Password.With-Header is a string attribute.
                         *      Even though we're handling binary data, the header
                         *      must be \0 terminated.
                         */
@@ -730,7 +730,7 @@ do_header:
 
        /*
         *      Rewrite to the default attribute type
-        *      currently Cleartext-Password.
+        *      currently Password.Cleartext.
         *
         *      This is usually correct if there's no
         *      header to indicate hash type.
@@ -967,7 +967,7 @@ fr_pair_t *password_find(bool *ephemeral, TALLOC_CTX *ctx, request_t *request,
                        RWDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
                        RWDEBUG("!!! Ignoring control.User-Password.  Update your        !!!");
                        RWDEBUG("!!! configuration so that the \"known good\" clear text !!!");
-                       RWDEBUG("!!! password is in Cleartext-Password and NOT in        !!!");
+                       RWDEBUG("!!! password is in Password.Cleartext and NOT in        !!!");
                        RWDEBUG("!!! User-Password.                                      !!!");
                        RWDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
                        continue;

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index cc3dbed97bdc59a77f4656b3c3ecf10027dbebba..0f4a8ee00a7e8be17bad67561bc040dbed077a2e 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -55,7 +55,7 @@ static fr_dict_attr_t const *attr_user_name;
 extern fr_dict_attr_autoload_t rlm_chap_dict_attr[];
 fr_dict_attr_autoload_t rlm_chap_dict_attr[] = {
        { .out = &attr_auth_type, .name = "Auth-Type", .type = FR_TYPE_UINT32, .dict = &dict_freeradius },
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 
        { .out = &attr_chap_password, .name = "Chap-Password", .type = FR_TYPE_OCTETS, .dict = &dict_radius },
        { .out = &attr_chap_challenge, .name = "Chap-Challenge", .type = FR_TYPE_OCTETS, .dict = &dict_radius },

diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c
index 24b119eadaed8c7e93ea5b5e67217cb25be88745..60c519ce97d6c05e0f693275b8f6fa04df097a3b 100644 (file)
--- a/src/modules/rlm_digest/rlm_digest.c
+++ b/src/modules/rlm_digest/rlm_digest.c
@@ -65,7 +65,7 @@ static const fr_dict_attr_t *attr_digest_user_name;
 extern fr_dict_attr_autoload_t rlm_digest_dict_attr[];
 fr_dict_attr_autoload_t rlm_digest_dict_attr[] = {
        { .out = &attr_auth_type, .name = "Auth-Type", .type = FR_TYPE_UINT32, .dict = &dict_freeradius },
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 
        { .out = &attr_digest_response, .name = "Digest-Response", .type = FR_TYPE_STRING, .dict = &dict_radius },
        { .out = &attr_digest_attributes, .name = "Digest-Attributes", .type = FR_TYPE_TLV, .dict = &dict_radius },
@@ -145,7 +145,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authenticate(rlm_rcode_t *p_result,
                passwd = fr_pair_find_by_da(&request->control_pairs, attr_cleartext_password);
        }
        if (!passwd) {
-               REDEBUG("Cleartext-Password or Digest-HA1 is required for authentication");
+               REDEBUG("Password.Cleartext or Digest-HA1 is required for authentication");
                RETURN_MODULE_INVALID;
        }
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index e59446dfbbe5f9f66fd4e2bfecf6d7eac87beed0..c7b41686bc356873b6f392bf31a4d6bde48950df 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -135,7 +135,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, module_ctx_t const *mc
        CONF_SECTION            *unlang;
 
        /*
-        *      Get the Cleartext-Password for this user.
+        *      Get the Password.Cleartext for this user.
         */
 
        /*

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
index 56a9e7f93c9665bf3ff86170bd919e343d89d4dd..5c9d2766f6896b2ffcb7a2fe210fe6075c078a3d 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
@@ -40,7 +40,7 @@ static fr_dict_attr_t const *attr_cleartext_password;
 
 extern fr_dict_attr_autoload_t rlm_eap_md5_dict_attr[];
 fr_dict_attr_autoload_t rlm_eap_md5_dict_attr[] = {
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { NULL }
 };
 
@@ -57,7 +57,7 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, UNUSED module_ctx_t co
        bool                    ephemeral;
 
        /*
-        *      Get the Cleartext-Password for this user.
+        *      Get the Password.Cleartext for this user.
         */
        fr_assert(eap_session->request != NULL);
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index 47911687694ed41891d4a3fc12deb2e3e240eee2..86220d4d5f3e77efa28b0c1df1232346e18ce816 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -77,7 +77,7 @@ static fr_dict_attr_t const *attr_ms_mppe_recv_key;
 
 extern fr_dict_attr_autoload_t rlm_eap_pwd_dict_attr[];
 fr_dict_attr_autoload_t rlm_eap_pwd_dict_attr[] = {
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_framed_mtu, .name = "Framed-MTU", .type = FR_TYPE_UINT32, .dict = &dict_radius },
        { .out = &attr_ms_mppe_send_key, .name = "Vendor-Specific.Microsoft.MPPE-Send-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius },
        { .out = &attr_ms_mppe_recv_key, .name = "Vendor-Specific.Microsoft.MPPE-Recv-Key", .type = FR_TYPE_OCTETS, .dict = &dict_radius },

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 35e9e53f173a5a355fb05fe1480a05286e6c851d..91ec38b8147ee86377001ea28ed2826ff9f7ee32 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -247,11 +247,11 @@ fr_dict_attr_t const *attr_user_name;
 
 extern fr_dict_attr_autoload_t rlm_ldap_dict_attr[];
 fr_dict_attr_autoload_t rlm_ldap_dict_attr[] = {
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
-       { .out = &attr_crypt_password, .name = "Crypt-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_crypt_password, .name = "Password.Crypt", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_ldap_userdn, .name = "LDAP-UserDN", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_nt_password, .name = "NT-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-       { .out = &attr_password_with_header, .name = "Password-With-Header", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_password_with_header, .name = "Password.With-Header", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 
        { .out = &attr_user_password, .name = "User-Password", .type = FR_TYPE_STRING, .dict = &dict_radius },
        { .out = &attr_user_name, .name = "User-Name", .type = FR_TYPE_STRING, .dict = &dict_radius },
@@ -1029,7 +1029,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
 
 #ifdef WITH_EDIR
        /*
-        *      We already have a Cleartext-Password.  Skip edir.
+        *      We already have a Password.Cleartext.  Skip edir.
         */
        if (fr_pair_find_by_da(&request->control_pairs, attr_cleartext_password)) goto skip_edir;
 
@@ -1054,7 +1054,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
                }
 
                /*
-                *      Add Cleartext-Password attribute to the request
+                *      Add Password.Cleartext attribute to the request
                 */
                MEM(pair_update_control(&vp, attr_cleartext_password) >= 0);
                fr_pair_value_bstrndup(vp, password, pass_size, true);

diff --git a/src/modules/rlm_mruby/README.md b/src/modules/rlm_mruby/README.md
index ee8ba38c5d46e480a55e87c1bdff3f799aac3d2d..1ce74cd00268bd8567527b6df89ad351b838488f 100644 (file)
--- a/src/modules/rlm_mruby/README.md
+++ b/src/modules/rlm_mruby/README.md
@@ -18,7 +18,7 @@ There are a lot of possible improvements here:
 * Is using a module really the best solution? We merely use it as a namespace, maybe something more OO would be nicer?
 * Can we simplify the getter methods? Simulating something like `attr_reader` would be perfect here
 * Use more suitable data types for the values passed to the method. We have data types like Integer and DateTime, so use those instead of stringifying everything
-* Add methods on the request object to modify the lists. The current return value is a bit ridiculous, a call like `request.config.add_vp('Cleartext-Password', 'hello')` looks a lot cleaner
+* Add methods on the request object to modify the lists. The current return value is a bit ridiculous, a call like `request.config.add_vp('Password.Cleartext', 'hello')` looks a lot cleaner
 * In a similar fashion: methods to get the attributes: `request.request.get_attribute('User-Name')`
 * Add a xlat callback, similar to `rlm_perl` `radius_xlat`
 * Unit tests

diff --git a/src/modules/rlm_mruby/example.rb b/src/modules/rlm_mruby/example.rb
index 4da056eb62bd7228d8eae01352aa05f147a797f5..2a1ae66fe6779e04b96b50730cbec508e28e0a98 100644 (file)
--- a/src/modules/rlm_mruby/example.rb
+++ b/src/modules/rlm_mruby/example.rb
@@ -14,7 +14,7 @@ module Radiusd
         radlog(L_WARN, "Authorize: #{request.request.inspect}(#{request.request.class})")
     
         reply = [["Framed-MTU", 1500]]
-        control = [["Cleartext-Password", "hello"], ["Tmp-String-0", "!*", "ANY"]]
+        control = [["Password.Cleartext", "hello"], ["Tmp-String-0", "!*", "ANY"]]
         return [RLM_MODULE_UPDATED, reply, control]
     end
     def self.post_auth(request)

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index f92f210cb9ed4e288c68d29615f432dd57be3046..d9a4975071d7389290aca4ff0f25732fb3dd58e7 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -165,9 +165,9 @@ fr_dict_attr_t const *attr_ms_chap2_cpw;
 extern fr_dict_attr_autoload_t rlm_mschap_dict_attr[];
 fr_dict_attr_autoload_t rlm_mschap_dict_attr[] = {
        { .out = &attr_auth_type, .name = "Auth-Type", .type = FR_TYPE_UINT32, .dict = &dict_freeradius },
-       { .out = &attr_cleartext_password, .name = "Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_cleartext_password, .name = "Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_eap_identity, .name = "EAP-Identity", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
-       { .out = &attr_ms_chap_new_cleartext_password, .name = "MS-CHAP-New-Cleartext-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_ms_chap_new_cleartext_password, .name = "MS-CHAP-New-Password.Cleartext", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_ms_chap_new_nt_password, .name = "MS-CHAP-New-NT-Password", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
        { .out = &attr_ms_chap_peer_challenge, .name = "MS-CHAP-Peer-Challenge", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
        { .out = &attr_ms_chap_use_ntlm_auth, .name = "MS-CHAP-Use-NTLM-Auth", .type = FR_TYPE_BOOL, .dict = &dict_freeradius },
@@ -1484,7 +1484,7 @@ static unlang_action_t mschap_error(rlm_rcode_t *p_result, rlm_mschap_t const *i
 }
 
 
-/** Find an NT-Password value, or create one from a Cleartext-Password, or Password-With-Header attribute
+/** Find an NT-Password value, or create one from a Password.Cleartext, or Password.With-Header attribute
  *
  * @param[out] ephemeral       Whether we created a new password
  *                             attribute.  Usually the caller will

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index f8739203d8e17fcf689947bb6127f8ee476254dd..a6a44a737b36d52ead01778d98da68d9be29eb0b 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -82,7 +82,7 @@ static fr_dict_attr_t const *attr_user;
 
 static fr_dict_attr_autoload_t rlm_pap_dict_attr[] = {
        { .out = &attr_auth_type, .name = "Auth-Type", .type = FR_TYPE_UINT32, .dict = &dict_freeradius },
-       { .out = &attr_root, .name = "Password-Root", .type = FR_TYPE_TLV, .dict = &dict_freeradius },
+       { .out = &attr_root, .name = "Password", .type = FR_TYPE_TLV, .dict = &dict_freeradius },
 
        { .out = &attr_user, .name = "User-Password", .type = FR_TYPE_STRING, .dict = &dict_radius },
 

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index db27e9af5e2d167c8091d33d17173240570c3d2a..50941e454cb9d5c684abe237e6323d9005099e2f 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -668,8 +668,8 @@ static void perl_vp_to_svpvn_element(request_t *request, AV *av, fr_pair_t const
 /*
  *     get the vps and put them in perl hash
  *     If one VP have multiple values it is added as array_ref
- *     Example for this is Cisco-AVPair that holds multiple values.
- *     Which will be available as array_ref in $RAD_REQUEST{'Cisco-AVPair'}
+ *     Example for this is Vendor-Specific.Cisco.AVPair that holds multiple values.
+ *     Which will be available as array_ref in $RAD_REQUEST{'Vendor-Specific.Cisco.AVPair'}
  */
 static void perl_store_vps(UNUSED TALLOC_CTX *ctx, request_t *request, fr_pair_t **vps, HV *rad_hv,
                           const char *hash_name, const char *list_name)

diff --git a/src/modules/rlm_rest/demo.pl b/src/modules/rlm_rest/demo.pl
index 3b6daa08d515ca806bf481ffdd203f339600cc16..66a1ba1fd4422da835111b22d605d9321b3abe8e 100755 (executable)
--- a/src/modules/rlm_rest/demo.pl
+++ b/src/modules/rlm_rest/demo.pl
@@ -46,7 +46,7 @@ while ($client = $daemon->accept) {
                        my $resp = HTTP::Response->new('200', 'OK');
 
                        $resp->header('Content-Type' => 'application/json');
-                       $resp->content('{"control.Cleartext-Password":"testing123","reply.Reply-Message":"Hello from demo.pl"}');
+                       $resp->content('{"control.Password.Cleartext":"testing123","reply.Reply-Message":"Hello from demo.pl"}');
 
                        $client->send_response($resp);
                } else {

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 646d7a23d4042998256086be3c03c0475876afb4..99081591c2ca55af326a99626c763a5623fdcfdc 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -84,7 +84,7 @@ static fr_dict_attr_t const *attr_acct_delay_time;
 extern fr_dict_attr_autoload_t rlm_unix_dict_attr[];
 fr_dict_attr_autoload_t rlm_unix_dict_attr[] = {
        { .out = &attr_auth_type, .name = "Auth-Type", .type = FR_TYPE_UINT32, .dict = &dict_freeradius },
-       { .out = &attr_crypt_password, .name = "Crypt-Password", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
+       { .out = &attr_crypt_password, .name = "Password.Crypt", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
        { .out = &attr_user_name, .name = "User-Name", .type = FR_TYPE_STRING, .dict = &dict_radius },
        { .out = &attr_login_ip_host, .name = "Login-IP-Host", .type = FR_TYPE_IPV4_ADDR, .dict = &dict_radius },
        { .out = &attr_framed_ip_address, .name = "Framed-IP-Address", .type = FR_TYPE_IPV4_ADDR, .dict = &dict_radius },