Search and replace in documentation s/authorize {/recv Access-Request {/ etc...

diff --git a/doc/configuration/acct_type.rst b/doc/configuration/acct_type.rst
index e8abff4e941c54216ddd81122d1d9ea053a811c7..0c8882427cbf62c92ea713b8883f98f4e8456098 100644 (file)
--- a/doc/configuration/acct_type.rst
+++ b/doc/configuration/acct_type.rst
@@ -8,7 +8,7 @@ syntax as Auth-Type and Autz-Type. The main difference in configuration
 between Acct-Type and Auth/Autz-Type lies in where the Acct-Type
 method is assigned. With Auth/Autz-Type, the method is typically
 assigned in the 'users' file. The 'users' file, naturally, is not
-processed during the handling of the accounting {} section. However,
+processed during the handling of the process Accounting-Request {} section. However,
 part of the default files {} module is the 'acct_users' file, which
 serves the same purpose as the 'users' file, but applies to accounting
 packets.
@@ -38,12 +38,12 @@ And in radiusd.conf::
         filename = ${radacctdir}/10.0.0.1/detail-%Y%m%d
   }
 
-  preacct {
+  recv Accounting-Request {
         suffix # Add the Realm A/V pair.
         files  # Add the Acct-Type A/V pair based on the Realm A/V pair.
   }
 
-  accounting {
+  process Accounting-Request {
 
         # If Acct-Type is SQLFOO use the 'sql1' instance of the SQL module.
 

diff --git a/doc/configuration/configurable_failover.rst b/doc/configuration/configurable_failover.rst
index 4e213358dbcdabb8818dc56970cd4142b6c18564..10fca7461c8a1a0ff42b603f3e8b40f5ae3bd3c2 100644 (file)
--- a/doc/configuration/configurable_failover.rst
+++ b/doc/configuration/configurable_failover.rst
@@ -7,7 +7,7 @@ Before configurable module failover, we had this kind of entry in
 ::
 
   #---
-  authorize {
+  recv Access-Request {
     preprocess
     files
   }
@@ -49,7 +49,7 @@ For example:
   }
 
   #  Handle accounting packets
-  accounting {
+  process Accounting-Request {
       detail                   # always log to detail, stopping if it fails
       redundant {
         sql1                   # try module sql1
@@ -89,7 +89,7 @@ even if the ``detail`` module fails.  The following example shows how:
 
   #--
   #  Handle accounting packets
-  accounting {
+  process Accounting-Request {
       detail {
         fail = 1
       }
@@ -182,7 +182,7 @@ to fail, so long as one of them succeeds.
 
   #--
   #  Handle accounting packets
-  accounting {
+  process Accounting-Request {
       group {
         detail1 {
           fail = 1             # remember ``fail`` with priority 1
@@ -290,7 +290,7 @@ We can see the exact rules by writing them out the long way:
 
 ::
 
-  authorize {
+  recv Access-Request {
     preprocess {
       notfound = 1
       noop     = 2
@@ -395,7 +395,7 @@ It would look like this:
 
 ::
 
-  authorize {
+  recv Access-Request {
     preprocess
     redundant {
       sql1

diff --git a/doc/configuration/load_balance.rst b/doc/configuration/load_balance.rst
index 792644472907fb689e21871f6020830cc95c244e..be6fa7da72431d3e601831dd069bbfc06a9b7184 100644 (file)
--- a/doc/configuration/load_balance.rst
+++ b/doc/configuration/load_balance.rst
@@ -16,7 +16,7 @@ be chosen at random, evenly spread over the modules in the list.
 
 An example is below::
 
-    accounting {
+    process Accounting-Request {
             load-balance {
                     sql1
                     sql2
@@ -30,7 +30,7 @@ In this case, 1/3 of the RADIUS requests will be processed by
 The "load-balance" section can be nested in a "redundant" section,
 or vice-versa::
 
-    accounting {
+    process Accounting-Request {
             load-balance {             # between two redundant sections below
                     redundant {
                             sql1
@@ -48,7 +48,7 @@ use sql2, and if sql2 is down, use sql1".  That way, you can guarantee
 both that load balancing occurs, and that the requests are *always*
 logged to one of the databases::
 
-    accounting {
+    process Accounting-Request {
             redundant {
                     load-balance {
                             sql1
@@ -63,7 +63,7 @@ used is down, then log to detail".
 
 And finally::
 
-    accounting {
+    process Accounting-Request {
             redundant {                        # between load-balance & detail
                     load-balance {             # between two redundant sections
                             redundant {

diff --git a/doc/modules/rlm_eap b/doc/modules/rlm_eap
index 33d38804246f01f7f738a8c73b55a017d1fa75a2..995c29c1645f341ce04c261f17c6b79d2e9fc6b1 100644 (file)
--- a/doc/modules/rlm_eap
+++ b/doc/modules/rlm_eap
@@ -193,13 +193,13 @@ HOW DO I USE IT (FAQ/Examples)
        }
 
        # eap sets the authenticate type as EAP
-       authorize {
+       recv Access-Request {
                ...
                eap
        }
 
        # eap authentication takes place.
-       authenticate {
+       process Access-Request {
                eap
        }
 
@@ -226,7 +226,7 @@ HOW DO I USE IT (FAQ/Examples)
 
        # ldap gets the Configured password.
        # eap sets the authenticate type as EAP
-       authorize {
+       recv Access-Request {
                ...
                ldap
                eap
@@ -234,7 +234,7 @@ HOW DO I USE IT (FAQ/Examples)
        }
 
        # eap authentication takes place.
-       authenticate {
+       process Access-Request {
                ...
                eap
                ...
@@ -253,7 +253,7 @@ HOW DO I USE IT (FAQ/Examples)
    # eap module should be configured as the First module in
    # the authorize stanza
 
-       authorize {
+       recv Access-Request {
                eap
                ...  other modules.
        }
@@ -269,7 +269,7 @@ HOW DO I USE IT (FAQ/Examples)
 
    Only if it is required then, in radiusd.conf
 
-       authorize {
+       recv Access-Request {
                eap
                ...  other modules.
        }

diff --git a/doc/modules/rlm_pam b/doc/modules/rlm_pam
index 8a6673cb9ec736e010c79496c1971fea7f13551b..db4bde7012066c07475a406fe6be5f1eac7a9101 100644 (file)
--- a/doc/modules/rlm_pam
+++ b/doc/modules/rlm_pam
@@ -36,7 +36,7 @@
 
    In the 'authenticate' section, do the same:
 
-   authenticate {
+   process Access-Request {
     # Uncomment this if you want to use PAM (Auth-Type = PAM)
         pam
        ...

diff --git a/doc/modules/rlm_soh b/doc/modules/rlm_soh
index eda5c4c2368167b6dd5d6bbf896a21788f0ff8f6..9a2fe02819df12c699e91039814eada7e2fcbe6a 100644 (file)
--- a/doc/modules/rlm_soh
+++ b/doc/modules/rlm_soh
@@ -114,7 +114,7 @@ server dhcp {
 The "soh" module decodes the radius & DHCP payloads. It also makes some dynamic
 variables available, for example:
 
-authorize {
+recv Access-Request {
   soh
   update request {
     Tmp-String-0 = "%{soh:OS}"

diff --git a/doc/modules/rlm_sql b/doc/modules/rlm_sql
index ceb7017013aeda75e99f07f7e16e2891e63aa9f4..52133e0b38234fbe8f27cf116a29c7b1b21de4dc 100644 (file)
--- a/doc/modules/rlm_sql
+++ b/doc/modules/rlm_sql
@@ -270,12 +270,12 @@
 
   And then you can use a specific instance in radiusd.conf, like
   so:
-  authorize {
+  recv Access-Request {
     ...
     sql_instance1
     ...
   }
-  accounting {
+  process Accounting-Request {
     ...
     sql_instance1
     sql_instance2

diff --git a/doc/modules/rlm_sqlcounter b/doc/modules/rlm_sqlcounter
index f8edac5a1bb90e35b74e3b684746f3212fe8286f..81f3beca251f2d9ab096fe767b02614043d9ddf8 100644 (file)
--- a/doc/modules/rlm_sqlcounter
+++ b/doc/modules/rlm_sqlcounter
@@ -107,7 +107,7 @@ $INCLUDE  ${confdir}/sqlcounter.conf
 [3] Make sure to have the sqlcounter names under authorize section
 like the followings:
 
-authorize {
+recv Access-Request {
 ...some entries here...
 ...some entries here...
 ...some entries here...

diff --git a/man/man5/radrelay.conf.5 b/man/man5/radrelay.conf.5
index 1d96fbad1994bbc3b95a09203820e0bda59c534d..481044cc1ed57ac9ca55743de7e2fc38879c245f 100644 (file)
--- a/man/man5/radrelay.conf.5
+++ b/man/man5/radrelay.conf.5
@@ -77,7 +77,7 @@ For example:
 .br
        ...
 .br
-       accounting {
+       process Accounting-Request {
 .br
                ...
 .br

diff --git a/man/man5/rlm_always.5 b/man/man5/rlm_always.5
index 383b2715e3009494349f969f579afd590f6f4c0b..98619badf5a4f1430a1fc7378f55925a71a9b61c 100644 (file)
--- a/man/man5/rlm_always.5
+++ b/man/man5/rlm_always.5
@@ -79,7 +79,7 @@ modules {
 .br
 
 .br
-authorize {
+recv Access-Request {
   ...
 .br
   redundant {

diff --git a/man/man5/rlm_detail.5 b/man/man5/rlm_detail.5
index c890a11b93c61d70c958066364342848ec2fe07c..d605f9ae5ce350f225e110f86ca06640151d59cc 100644 (file)
--- a/man/man5/rlm_detail.5
+++ b/man/man5/rlm_detail.5
@@ -63,7 +63,7 @@ modules {
 }
   ...
 .br
-accounting {
+process Accounting-Request {
  ...
 .br
  detail

diff --git a/man/man5/rlm_mschap.5 b/man/man5/rlm_mschap.5
index 492c84e984b5e2c61756475714974b51603e52d9..8857d135f440871a715be092f0a7b35ccfa79120 100644 (file)
--- a/man/man5/rlm_mschap.5
+++ b/man/man5/rlm_mschap.5
@@ -75,7 +75,7 @@ modules {
 .br
  ...
 .br
-authorize {
+recv Access-Request {
   ...
 .br
   mschap
@@ -85,7 +85,7 @@ authorize {
 }
  ...
 .br
-authenticate {
+process Access-Request {
   ...
 .br
   mschap

diff --git a/man/man5/unlang.5 b/man/man5/unlang.5
index 6748235981c79667a5ba57401e98cb0a210e2e82..20924d22b404bbf5da2bf6a7441b7fcdb5134965 100644 (file)
--- a/man/man5/unlang.5
+++ b/man/man5/unlang.5
@@ -341,7 +341,7 @@ Returns from the current top-level section, e.g. "authorize" or
 "if" and "else" statements.
 
 .DS
-       authorize {
+       recv Access-Request {
 .br
                if (...) {
 .br

diff --git a/raddb/mods-available/README.rst b/raddb/mods-available/README.rst
index 8ffb7648fda60c0ca9b7817078d5fd63cd25eb0c..29ba81f874c663ec310e6be94caed66c1fdebfe3 100644 (file)
--- a/raddb/mods-available/README.rst
+++ b/raddb/mods-available/README.rst
@@ -35,7 +35,7 @@ Modules are conditionally enabled by adding a "-" before their name in
 a virtual server.  For example, you can do::
 
   server {
-    authorize {
+    recv Access-Request {
       ...
       ldap
       -sql

diff --git a/raddb/mods-available/ldap b/raddb/mods-available/ldap
index 324839409e7e6b46dd0633baa07388c640fb3720..62e8aa6c9502f223c729c18470ce5484feee0ae0 100644 (file)
--- a/raddb/mods-available/ldap
+++ b/raddb/mods-available/ldap
@@ -138,7 +138,7 @@ ldap {
 
        #  Note: set_auth_type was removed in v3.x.x
        #  Equivalent functionality can be achieved by adding the following
-       #  stanza to the authorize {} section of your virtual server.
+       #  stanza to the recv Access-Request {} section of your virtual server.
        #
        #    ldap
        #    if ((ok || updated) && User-Password) {

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 3a12c8a08a1a62eb583845158d92f05a69fb0504..b98e2b041699479508c737a82a364e37c0cfe5d0 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -804,8 +804,8 @@ $INCLUDE sites-enabled/
 
 ######################################################################
 #
-#      All of the other configuration sections like "authorize {}",
-#      "authenticate {}", "accounting {}", have been moved to the
+#      All of the other configuration sections like "recv Access-Request {}",
+#      "process Access-Request {}", "process Accounting-Request {}", have been moved to the
 #      the file:
 #
 #              raddb/sites-available/default

diff --git a/raddb/radrelay.conf.in b/raddb/radrelay.conf.in
index b707b34296b7647b21e707107a8ad0433ac25df0..8dcab8b80d8814b34e7ca40807db807a9745b144 100644 (file)
--- a/raddb/radrelay.conf.in
+++ b/raddb/radrelay.conf.in
@@ -157,7 +157,7 @@ server radrelay {
        #  See also raddb/sites-available/copy-acct-to-home-server
        #  for additional description.
        #
-       preacct {
+       recv Accounting-Request {
                #
                #  Proxy the packet using the given realm.
                #  Note that we do not use the realm for anything else such

diff --git a/scripts/exec-program-wait b/scripts/exec-program-wait
index a8513095bf1bd6b3e706ff208582f9e619e41872..5809cb96d7d24fb035e351501cb42febaa57fba8 100755 (executable)
--- a/scripts/exec-program-wait
+++ b/scripts/exec-program-wait
@@ -23,7 +23,7 @@
 #      ...
 #}
 #
-#authorize {
+#recv Access-Request {
 #      ...
 #      exec
 #      ...

diff --git a/src/tests/vectors/eapsim-03/radiusd-example.txt b/src/tests/vectors/eapsim-03/radiusd-example.txt
index b59b2f34ce7867a271aadca87385fc2eb1098f65..cf31340b7195791ffb85de237a327db601e901dc 100644 (file)
--- a/src/tests/vectors/eapsim-03/radiusd-example.txt
+++ b/src/tests/vectors/eapsim-03/radiusd-example.txt
@@ -1275,7 +1275,7 @@ instantiate {
 #
 #  Make *sure* that 'preprocess' comes before any realm if you
 #  need to setup hints for the remote radius server
-authorize {
+recv Access-Request {
        #
        #  The preprocess module takes care of sanitizing some bizarre
        #  attributes in the request, and turning them into attributes
@@ -1352,7 +1352,7 @@ authorize {
 #   For example, the chap module will set Auth-Type to CHAP, ldap to LDAP, etc.
 # - After that create corresponding authtype sections in the
 #   authenticate section below and call the appropriate modules.
-authenticate {
+process Access-Request {
        #
        #  PAP authentication, when a back-end database listed
        #  in the 'authorize' section supplies a password.  The
@@ -1408,7 +1408,7 @@ authenticate {
 #
 #  Pre-accounting.  Decide which accounting type to use.
 #
-preacct {
+recv Accounting-Request {
        preprocess
 
        #
@@ -1429,7 +1429,7 @@ preacct {
 #
 #  Accounting.  Log the accounting data.
 #
-accounting {
+process Accounting-Request {
        #
        #  Ensure that we have a semi-unique identifier for every
        #  request, and many NAS boxes are broken.