typo. Fixes #2357

diff --git a/raddb/dictionary b/raddb/dictionary
index eed5d70f41b314f9ed3f006a22d9f9a2be2c9516..b848eee3cb0016e1251adfa89775e1acf2c2c520 100644 (file)
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -47,3 +47,15 @@
 #ATTRIBUTE     My-Local-String         3000    string
 #ATTRIBUTE     My-Local-IPAddr         3001    ipaddr
 #ATTRIBUTE     My-Local-Integer        3002    integer
+
+VENDOR example    65535
+
+BEGIN-VENDOR example
+ATTRIBUTE Example-Integer      1 integer
+ATTRIBUTE Example-String       2 string
+ATTRIBUTE Example-IP-Address   3 ipaddr
+
+VALUE  Example-Integer Name1   1
+VALUE  Example-Integer Name2   2
+
+END-VENDOR example

diff --git a/raddb/mods-available/echo b/raddb/mods-available/echo
index ad3e15933f9e85c5566810432a5fec8f23d877c1..0f00fb2cebb6024d74a035352903d809d6eab426 100644 (file)
--- a/raddb/mods-available/echo
+++ b/raddb/mods-available/echo
@@ -52,7 +52,7 @@ exec echo {
        #  field, so things like the following example will
        #  work.
        #
-       program = "/bin/echo %{User-Name}"
+       program = "/bin/echo 'Filter-Id := %{User-Name}'"
 
        #
        #  The attributes which are placed into the
@@ -79,7 +79,7 @@ exec echo {
        #  restrictions as to availability, are the same as
        #  for the input_pairs.
        #
-       output_pairs = reply
+       output_pairs = coa
 
        #
        #  When to execute the program.  If the packet

diff --git a/raddb/mods-config/files/authorize b/raddb/mods-config/files/authorize
index 67e0cd4e8ae088c5ef7df1ce3d65d8334bd721a9..be3e1ddb57e60d94c9e5c84e1f2c5a41983603be 100644 (file)
--- a/raddb/mods-config/files/authorize
+++ b/raddb/mods-config/files/authorize
@@ -1,3 +1,7 @@
+bob    Cleartext-Password := "bob"
+       Session-Timeout := 1234,
+       Example-Integer := 6809
+
 #
 #      Configuration file for the rlm_files module.
 #      Please see rlm_files(5) manpage for more information.

diff --git a/raddb/mods-config/preprocess/hints b/raddb/mods-config/preprocess/hints
index 84d4d78d5dc8613f6205fc2ef48f454101caaf33..5f246fda6fbba95410238470ff1b8322419643c7 100644 (file)
--- a/raddb/mods-config/preprocess/hints
+++ b/raddb/mods-config/preprocess/hints
@@ -1,3 +1,10 @@
+<<<<<<< Updated upstream
+=======
+DEFAULT User-Name =~ "^([^@]+)@realm.com", NAS-IP-Address == "127.0.0.1"
+     User-Name := "%{1}"
+
+# hints
+>>>>>>> Stashed changes
 #
 #  hints
 #

diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index e006430e366fa4b8f52b53573be42489d6e6bc9f..f4fb9f7b5bdd3d0aa5c02d3c10a4889c93968ddc 100644 (file)
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -643,7 +643,7 @@ post-auth {
                        (username, pass, reply, authdate) \
                VALUES(\
                        '%{User-Name}', \
-                       '%{%{User-Password}:-Chap-Password}', \
+                       '%{%{User-Password}:-%{Chap-Password}}', \
                        '%{reply:Packet-Type}', \
                        NOW())"
 }

diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index f0ad079f5db59f94476059fb8b3b4e6183b1e30a..8353293612515fb1baf51a982df89c405ed213c2 100644 (file)
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -566,6 +566,14 @@ authenticate {
 preacct {
        preprocess
 
+        update coa {
+                  User-Name="%{User-Name}"
+                  Acct-Session-Id="%{%{Acct-Multi-Session-Id}:-%{Acct-Session-ID}}"
+          }
+                 
+          echo
+
+
        #
        #  Merge Acct-[Input|Output]-Gigawords and Acct-[Input-Output]-Octets
        #  into a single 64bit counter Acct-[Input|Output]-Octets64.