Added 'encrypt=3' to the dictionaries, to avoid having the code

	in radius.c add the flags manually

diff --git a/share/dictionary.ascend b/share/dictionary.ascend
index 4fa215b..3229ee0 100644 (file)
--- a/share/dictionary.ascend
+++ b/share/dictionary.ascend
@@ -226,8 +226,8 @@ ATTRIBUTE   X-Ascend-PPP-VJ-Slot-Comp               210     integer
 ATTRIBUTE      X-Ascend-PPP-VJ-1172                    211     integer
 ATTRIBUTE      X-Ascend-PPP-Async-Map                  212     integer
 ATTRIBUTE      X-Ascend-Third-Prompt                   213     string
-ATTRIBUTE      X-Ascend-Send-Secret                    214     string
-ATTRIBUTE      X-Ascend-Receive-Secret                 215     string
+ATTRIBUTE      X-Ascend-Send-Secret                    214     string encrypt=3
+ATTRIBUTE      X-Ascend-Receive-Secret                 215     string encrypt=3
 ATTRIBUTE      X-Ascend-IPX-Peer-Mode                  216     integer
 ATTRIBUTE      X-Ascend-IP-Pool-Definition             217     string
 ATTRIBUTE      X-Ascend-Assign-IP-Pool                 218     integer
@@ -479,8 +479,8 @@ ATTRIBUTE   Ascend-PPP-VJ-Slot-Comp         210     integer         Ascend
 ATTRIBUTE      Ascend-PPP-VJ-1172              211     integer         Ascend
 ATTRIBUTE      Ascend-PPP-Async-Map            212     integer         Ascend
 ATTRIBUTE      Ascend-Third-Prompt             213     string          Ascend
-ATTRIBUTE      Ascend-Send-Secret              214     string          Ascend
-ATTRIBUTE      Ascend-Receive-Secret           215     string          Ascend
+ATTRIBUTE      Ascend-Send-Secret              214     string          Ascend encrypt=3
+ATTRIBUTE      Ascend-Receive-Secret           215     string          Ascend encrypt=3
 ATTRIBUTE      Ascend-IPX-Peer-Mode            216     integer         Ascend
 ATTRIBUTE      Ascend-IP-Pool-Definition       217     string          Ascend
 ATTRIBUTE      Ascend-Assign-IP-Pool           218     integer         Ascend

diff --git a/src/lib/radius.c b/src/lib/radius.c
index 55de4d4..51f8141 100644 (file)
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -391,18 +391,6 @@ int rad_send(RADIUS_PACKET *packet, const RADIUS_PACKET *original,
                          case PW_TYPE_STRING:
                          case PW_TYPE_OCTETS:
                                  /*
-                                  *  FIXME: HACK for non-updated dictionaries.
-                                  *  REMOVE in a future release.
-                                  */
-                                 if ((strcmp(reply->name, "Ascend-Send-Secret") == 0) ||
-                                     (strcmp(reply->name, "Ascend-Receive-Secret") == 0)) {
-                                         reply->flags.encrypt = FLAG_ENCRYPT_ASCEND_SECRET;
-                                 }
-                                 if (reply->attribute == PW_USER_PASSWORD) {
-                                         reply->flags.encrypt = FLAG_ENCRYPT_USER_PASSWORD;
-                                 }
-
-                                 /*
                                   *  Encrypt the various password styles
                                   */
                                  switch (reply->flags.encrypt) {
@@ -1388,18 +1376,6 @@ int rad_decode(RADIUS_PACKET *packet, RADIUS_PACKET *original,
                        }
 
                        /*
-                        *  FIXME: HACK for non-updated dictionaries.
-                        *  REMOVE in a future release.
-                        */
-                       if ((strcmp(pair->name, "Ascend-Send-Secret") == 0) ||
-                           (strcmp(pair->name, "Ascend-Receive-Secret") == 0)) {
-                               pair->flags.encrypt = FLAG_ENCRYPT_ASCEND_SECRET;
-                       }
-                       if (pair->attribute == PW_USER_PASSWORD) {
-                               pair->flags.encrypt = FLAG_ENCRYPT_USER_PASSWORD;
-                       }
-
-                       /*
                         *      Decrypt passwords here.
                         */
                        switch (pair->flags.encrypt) {