Added server field to NAS table, and updated docs to match

diff --git a/raddb/sql/mysql/dialup.conf b/raddb/sql/mysql/dialup.conf
index 6020196..236c2ef 100644 (file)
--- a/raddb/sql/mysql/dialup.conf
+++ b/raddb/sql/mysql/dialup.conf
@@ -59,9 +59,10 @@
        #  2. Shortname
        #  3. Type
        #  4. Secret
+       #  5. Server
        #######################################################################
 
-       nas_query = "SELECT id, nasname, shortname, type, secret FROM ${nas_table}"
+       nas_query = "SELECT id, nasname, shortname, type, secret, server FROM ${nas_table}"
 
        #######################################################################
        #  Authorization Queries

diff --git a/raddb/sql/mysql/nas.sql b/raddb/sql/mysql/nas.sql
index 45cb099..c7fc803 100644 (file)
--- a/raddb/sql/mysql/nas.sql
+++ b/raddb/sql/mysql/nas.sql
@@ -8,7 +8,7 @@ CREATE TABLE nas (
   type varchar(30) DEFAULT 'other',
   ports int(5),
   secret varchar(60) DEFAULT 'secret' NOT NULL,
-#  server varchar(64),
+  server varchar(64),
   community varchar(50),
   description varchar(200) DEFAULT 'RADIUS Client',
   PRIMARY KEY (id),

diff --git a/raddb/sql/oracle/dialup.conf b/raddb/sql/oracle/dialup.conf
index 31a45bf..a0058e8 100644 (file)
--- a/raddb/sql/oracle/dialup.conf
+++ b/raddb/sql/oracle/dialup.conf
@@ -52,6 +52,20 @@
 
 
        #######################################################################
+       #  NAS Query
+       #######################################################################
+       #  This query retrieves the radius clients
+       #
+       #  0. Row ID (currently unused)
+       #  1. Name (or IP address)
+       #  2. Shortname
+       #  3. Type
+       #  4. Secret
+       #  5. Virtual server
+       #######################################################################
+
+       nas_query = "SELECT id, nasname, shortname, type, secret, server FROM ${nas_table}"
+       #######################################################################
        #  Authorization Queries
        #######################################################################
        #  These queries compare the check items for the user

diff --git a/raddb/sql/oracle/nas.sql b/raddb/sql/oracle/nas.sql
index 965c536..5d9cf29 100644 (file)
--- a/raddb/sql/oracle/nas.sql
+++ b/raddb/sql/oracle/nas.sql
@@ -9,9 +9,7 @@ CREATE TABLE nas (
        type            VARCHAR(30),
        ports           INT,
        secret          VARCHAR(60),
-/*
        server          VARCHAR(64),
- */
        community       VARCHAR(50),
        description     VARCHAR(200)
 );

diff --git a/raddb/sql/postgresql/dialup.conf b/raddb/sql/postgresql/dialup.conf
index 7feef84..5ff1e27 100644 (file)
--- a/raddb/sql/postgresql/dialup.conf
+++ b/raddb/sql/postgresql/dialup.conf
@@ -60,9 +60,10 @@ sql_user_name = "%{User-Name}"
 #  2. Shortname
 #  3. Type
 #  4. Secret
+#  5. Server
 #######################################################################
 
-nas_query = "SELECT id, nasname, shortname, type, secret FROM ${nas_table}"
+nas_query = "SELECT id, nasname, shortname, type, secret, server FROM ${nas_table}"
 
 #######################################################################
 #  Authorization Queries

diff --git a/raddb/sql/postgresql/nas.sql b/raddb/sql/postgresql/nas.sql
index 5cb7449..b787c57 100644 (file)
--- a/raddb/sql/postgresql/nas.sql
+++ b/raddb/sql/postgresql/nas.sql
@@ -8,9 +8,7 @@ CREATE TABLE nas (
        type            VARCHAR(30) NOT NULL DEFAULT 'other',
        ports           int4,
        secret          VARCHAR(60) NOT NULL,
-/*
        server          VARCHAR(64),
- */
        community       VARCHAR(50),
        description     VARCHAR(200)
 );