MS-MPPE-Encryption-Types, not MS-MPPE-Encryption-Type (per RFC 2548).

diff --git a/raddb/dictionary.microsoft b/raddb/dictionary.microsoft
index 1a93570..b0aea2b 100644 (file)
--- a/raddb/dictionary.microsoft
+++ b/raddb/dictionary.microsoft
@@ -14,7 +14,7 @@ ATTRIBUTE     MS-CHAP-CPW-2           4       octets
 ATTRIBUTE      MS-CHAP-LM-Enc-PW       5       octets
 ATTRIBUTE      MS-CHAP-NT-Enc-PW       6       octets
 ATTRIBUTE      MS-MPPE-Encryption-Policy 7     octets
-ATTRIBUTE      MS-MPPE-Encryption-Type  8      octets
+ATTRIBUTE      MS-MPPE-Encryption-Types  8     octets
 ATTRIBUTE      MS-RAS-Vendor           9       integer # content is Vendor-ID
 ATTRIBUTE      MS-CHAP-Domain          10      string
 ATTRIBUTE      MS-CHAP-Challenge       11      octets

diff --git a/share/dictionary.microsoft b/share/dictionary.microsoft
index 1a93570..b0aea2b 100644 (file)
--- a/share/dictionary.microsoft
+++ b/share/dictionary.microsoft
@@ -14,7 +14,7 @@ ATTRIBUTE     MS-CHAP-CPW-2           4       octets
 ATTRIBUTE      MS-CHAP-LM-Enc-PW       5       octets
 ATTRIBUTE      MS-CHAP-NT-Enc-PW       6       octets
 ATTRIBUTE      MS-MPPE-Encryption-Policy 7     octets
-ATTRIBUTE      MS-MPPE-Encryption-Type  8      octets
+ATTRIBUTE      MS-MPPE-Encryption-Types  8     octets
 ATTRIBUTE      MS-RAS-Vendor           9       integer # content is Vendor-ID
 ATTRIBUTE      MS-CHAP-Domain          10      string
 ATTRIBUTE      MS-CHAP-Challenge       11      octets

diff --git a/src/modules/rlm_x99_token/x99_pwe.c b/src/modules/rlm_x99_token/x99_pwe.c
index 863b833..85d4383 100644 (file)
--- a/src/modules/rlm_x99_token/x99_pwe.c
+++ b/src/modules/rlm_x99_token/x99_pwe.c
@@ -306,11 +306,7 @@ x99_pw_valid(const REQUEST *request, int attr,
                pairadd(vps, vp);
            else
                ; /* choke and die */
-#if 1
-           if ((vp = pairmake("MS-MPPE-Encryption-Type",
-#else
            if ((vp = pairmake("MS-MPPE-Encryption-Types",
-#endif
                               MPPE_ENC_TYPES_RC4_128,
                               T_OP_EQ)) != NULL)
                pairadd(vps, vp);
@@ -657,11 +653,7 @@ x99_pw_valid(const REQUEST *request, int attr,
                pairadd(vps, vp);
            else
                ; /* choke and die */
-#if 1
-           if ((vp = pairmake("MS-MPPE-Encryption-Type",
-#else
            if ((vp = pairmake("MS-MPPE-Encryption-Types",
-#endif
                               MPPE_ENC_TYPES_RC4_128,
                               T_OP_EQ)) != NULL)
                pairadd(vps, vp);