Move rlm_checkval to the stable modules

diff --git a/raddb/experimental.conf b/raddb/experimental.conf
index c5ab87b..ff8c87b 100644 (file)
--- a/raddb/experimental.conf
+++ b/raddb/experimental.conf
@@ -245,39 +245,3 @@
                # Reload the hash every 600 seconds (10mins)
                hash_reload = 600
        }
-
-       #  A simple value checking module
-       #
-       #  It can be used to check if an attribute value in the request
-       #  matches a (possibly multi valued) attribute in the check
-       #  items This can be used for example for caller-id
-       #  authentication.  For the module to run, both the request
-       #  attribute and the check items attribute must exist
-       #
-       #  i.e.
-       #  A user has an ldap entry with 2 radiusCallingStationId
-       #  attributes with values "12345678" and "12345679".  If we
-       #  enable rlm_checkval, then any request which contains a
-       #  Calling-Station-Id with one of those two values will be
-       #  accepted.  Requests with other values for
-       #  Calling-Station-Id will be rejected.
-       #
-       #  Regular expressions in the check attribute value are allowed
-       #  as long as the operator is '=~'
-       #
-       checkval {
-               # The attribute to look for in the request
-               item-name = Calling-Station-Id
-
-               # The attribute to look for in check items. Can be multi valued
-               check-name = Calling-Station-Id
-
-               # The data type. Can be
-                # string,integer,ipaddr,date,abinary,octets
-               data-type = string
-
-               # If set to yes and we dont find the item-name attribute in the
-               # request then we send back a reject
-               # DEFAULT is no
-               #notfound-reject = no
-       }

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 25a5397..dd07136 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -862,6 +862,42 @@ $INCLUDE ${confdir}/eap.conf
                ignore_default = no
                ignore_null = no
        }
+
+       #  A simple value checking module
+       #
+       #  It can be used to check if an attribute value in the request
+       #  matches a (possibly multi valued) attribute in the check
+       #  items This can be used for example for caller-id
+       #  authentication.  For the module to run, both the request
+       #  attribute and the check items attribute must exist
+       #
+       #  i.e.
+       #  A user has an ldap entry with 2 radiusCallingStationId
+       #  attributes with values "12345678" and "12345679".  If we
+       #  enable rlm_checkval, then any request which contains a
+       #  Calling-Station-Id with one of those two values will be
+       #  accepted.  Requests with other values for
+       #  Calling-Station-Id will be rejected.
+       #
+       #  Regular expressions in the check attribute value are allowed
+       #  as long as the operator is '=~'
+       #
+       checkval {
+               # The attribute to look for in the request
+               item-name = Calling-Station-Id
+
+               # The attribute to look for in check items. Can be multi valued
+               check-name = Calling-Station-Id
+
+               # The data type. Can be
+               # string,integer,ipaddr,date,abinary,octets
+               data-type = string
+
+               # If set to yes and we dont find the item-name attribute in the
+               # request then we send back a reject
+               # DEFAULT is no
+               #notfound-reject = no
+       }
        
        #  rewrite arbitrary packets.  Useful in accounting and authorization.
        #
@@ -1551,6 +1587,10 @@ authorize {
        #
        #  Enforce daily limits on time spent logged in.
 #      daily
+
+       #
+       # Use the checkval module
+#      checkval
 }
 
 

diff --git a/src/modules/stable b/src/modules/stable
index 5ae1cd9..1395429 100644 (file)
--- a/src/modules/stable
+++ b/src/modules/stable
@@ -26,3 +26,4 @@ rlm_realm
 rlm_sql
 rlm_unix
 rlm_x99_token
+rlm_checkval