Merge pull request #1991 from spaetow/v3.0.x

Add SQL backing to Moonshot-*-TargetedId generation

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c606fc0..320dc33 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,7 @@ FreeRADIUS 3.0.14 Mon 06 Mar 2017 13:00:00 EDT urgency=medium
        * Enforce TLS client certificate expiration on
          session resumption, and Session-Timeout.
        * Updated dictionary.cisco.vpn3000, dictionary.patton
+       * Added dictionary.dellemc
        * Lowered the log output for failed PEAP sessions.
        * ALlow utc in rlm_date.  Patch from
          Peter Lambrechtsen.

diff --git a/raddb/mods-config/files/accounting b/raddb/mods-config/files/accounting
index 322d33a..eaf952a 100644 (file)
--- a/raddb/mods-config/files/accounting
+++ b/raddb/mods-config/files/accounting
@@ -9,13 +9,17 @@
 #  Realm, the Huntgroup-Name or any combinaison of the attribute/value
 #  pairs contained in an accounting packet.
 #
-#DEFAULT Realm == "foo.net", Acct-Type := sql_log.foo
+#  You will need to add an "Acct-Type foo {...}" subsection to the
+#  main "accounting" section in order for these sample configurations
+#  to work.
 #
-#DEFAULT Huntgroup-Name == "wifi", Acct-Type := sql_log.wifi
+#DEFAULT Realm == "foo.net", Acct-Type := foo
 #
-#DEFAULT Client-IP-Address == 10.0.0.1, Acct-Type := sql_log.other
+#DEFAULT Huntgroup-Name == "wifi", Acct-Type := wifi
 #
-#DEFAULT Acct-Status-Type == Start, Acct-Type := sql_log.start
+#DEFAULT Client-IP-Address == 10.0.0.1, Acct-Type := other
+#
+#DEFAULT Acct-Status-Type == Start, Acct-Type := start
 
 #  Replace the User-Name with the Stripped-User-Name, if it exists.
 #

diff --git a/raddb/sites-available/abfab-tr-idp b/raddb/sites-available/abfab-tr-idp
index 3ef581e..e022486 100644 (file)
--- a/raddb/sites-available/abfab-tr-idp
+++ b/raddb/sites-available/abfab-tr-idp
@@ -81,12 +81,6 @@ post-auth {
        -sql
 
        #
-       #  Instead of sending the query to the SQL server,
-       #  write it into a log file.
-       #
-#      sql_log
-
-       #
        #  Un-comment the following if you want to modify the user's object
        #  in LDAP after a successful login.
        #

diff --git a/raddb/sites-available/decoupled-accounting b/raddb/sites-available/decoupled-accounting
index a440e77..6b1b5b3 100644 (file)
--- a/raddb/sites-available/decoupled-accounting
+++ b/raddb/sites-available/decoupled-accounting
@@ -119,12 +119,6 @@ accounting {
        #  See "Accounting queries" in sql.conf
 #      sql
 
-       #
-       #  Instead of sending the query to the SQL server,
-       #  write it into a log file.
-       #
-#      sql_log
-
        #  Cisco VoIP specific bulk accounting
 #      pgsql-voip
 

diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index 5d91175..3616050 100644 (file)
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -653,12 +653,6 @@ accounting {
 #              ok
 #      }
 
-       #
-       #  Instead of sending the query to the SQL server,
-       #  write it into a log file.
-       #
-#      sql_log
-
        #  Cisco VoIP specific bulk accounting
 #      pgsql-voip
 
@@ -738,12 +732,6 @@ post-auth {
        -sql
 
        #
-       #  Instead of sending the query to the SQL server,
-       #  write it into a log file.
-       #
-#      sql_log
-
-       #
        #  Un-comment the following if you want to modify the user's object
        #  in LDAP after a successful login.
        #

diff --git a/raddb/sites-available/inner-tunnel b/raddb/sites-available/inner-tunnel
index c1e8ae1..70b1d8d 100644 (file)
--- a/raddb/sites-available/inner-tunnel
+++ b/raddb/sites-available/inner-tunnel
@@ -302,12 +302,6 @@ post-auth {
        -sql
 
        #
-       #  Instead of sending the query to the SQL server,
-       #  write it into a log file.
-       #
-#      sql_log
-
-       #
        #  Un-comment the following if you have set
        #  'edir_account_policy_check = yes' in the ldap module sub-section of
        #  the 'modules' section.

diff --git a/share/dictionary b/share/dictionary
index 03da5d7..fe89609 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -176,6 +176,7 @@ $INCLUDE dictionary.colubris
 $INCLUDE dictionary.compatible
 $INCLUDE dictionary.cosine
 $INCLUDE dictionary.dante
+$INCLUDE dictionary.dellemc
 $INCLUDE dictionary.dlink
 $INCLUDE dictionary.digium
 $INCLUDE dictionary.dragonwave

diff --git a/share/dictionary.dellemc b/share/dictionary.dellemc
new file mode 100644 (file)
index 0000000..68c2758
--- /dev/null
+++ b/share/dictionary.dellemc
@@ -0,0 +1,18 @@
+# -*- text -*-
+# Copyright (C) 2017 The FreeRADIUS Server project and contributors
+#
+#   Dell Inc.
+#
+#   DellEMC-AVpair      Attribute-Value Pair.
+#   DellEMC-Group-Name  The Linux primary group name associated with the user.
+#                       This must be an existing group in /etc/groups.
+
+VENDOR         DellEMC                         674
+
+BEGIN-VENDOR   DellEMC
+
+ATTRIBUTE      DellEMC-AVpair                          1       string
+ATTRIBUTE      DellEMC-Group-Name                      2       string
+
+END-VENDOR DellEMC
+