From: Matthew Newton Date: Wed, 7 Nov 2012 22:11:19 +0000 (+0000) Subject: auto line ending and Id fixups X-Git-Tag: release_2_2_1~218 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=234f85f4fa337ec56e9b4f984d934fff99f3cc6b;p=thirdparty%2Ffreeradius-server.git auto line ending and Id fixups --- diff --git a/dialup_admin/htdocs/help/filter_id_help.html b/dialup_admin/htdocs/help/filter_id_help.html index f86ffb2d167..3f519822222 100644 --- a/dialup_admin/htdocs/help/filter_id_help.html +++ b/dialup_admin/htdocs/help/filter_id_help.html @@ -1,38 +1,38 @@ - - -Framed-Id Help Page - - - -
- - - - - -
- - -
Filter-Id Help Page 
-
- - - - -
-
-
-
-  This Attribute indicates the name of the filter list for this
-  user. Zero or more Filter-Id attributes MAY be sent in an
-  Access-Accept packet.
-
-  Identifying a filter list by name allows the filter to be used on
-  different NASes without regard to filter-list implementation
-  details.  
-
-Close Window -
-
- - + + +Framed-Id Help Page + + + +
+ + + + + +
+ + +
Filter-Id Help Page 
+
+ + + + +
+
+
+
+  This Attribute indicates the name of the filter list for this
+  user. Zero or more Filter-Id attributes MAY be sent in an
+  Access-Accept packet.
+
+  Identifying a filter list by name allows the filter to be used on
+  different NASes without regard to filter-list implementation
+  details.  
+
+Close Window +
+
+ + diff --git a/dialup_admin/htdocs/help/framed_protocol_help.html b/dialup_admin/htdocs/help/framed_protocol_help.html index a4ce762db78..92b3ae8a941 100644 --- a/dialup_admin/htdocs/help/framed_protocol_help.html +++ b/dialup_admin/htdocs/help/framed_protocol_help.html @@ -1,42 +1,42 @@ - - -Framed Protocol Help Page - - - -
- - - - - -
- - -
Framed Protocol Help Page 
-
- - - - -
-
-
-
-  This Attribute indicates the framing to be used for framed access.
-  It MAY be used in both Access-Request and Access-Accept packets.
-
-  Possible values are:
-
- 1 PPP
- 2 SLIP
- 3 AppleTalk Remote Access Protocol (ARAP)
- 4 Gandalf proprietary SingleLink/Multilink protocol
- 5 Xylogics proprietary IPX/SLIP
- 6 X.75 Synchronous
-
-Close Window -
-
- - + + +Framed Protocol Help Page + + + +
+ + + + + +
+ + +
Framed Protocol Help Page 
+
+ + + + +
+
+
+
+  This Attribute indicates the framing to be used for framed access.
+  It MAY be used in both Access-Request and Access-Accept packets.
+
+  Possible values are:
+
+ 1 PPP
+ 2 SLIP
+ 3 AppleTalk Remote Access Protocol (ARAP)
+ 4 Gandalf proprietary SingleLink/Multilink protocol
+ 5 Xylogics proprietary IPX/SLIP
+ 6 X.75 Synchronous
+
+Close Window +
+
+ + diff --git a/dialup_admin/htdocs/help/service_type_help.html b/dialup_admin/htdocs/help/service_type_help.html index d8dcf607568..7190e4dcbef 100644 --- a/dialup_admin/htdocs/help/service_type_help.html +++ b/dialup_admin/htdocs/help/service_type_help.html @@ -1,81 +1,81 @@ - - -Service-Type Help Page - - - -
- - - - - -
- - -
Service-Type Help Page 
-
- - - - -
-
-
-
-  This Attribute indicates the type of service the user has
-  requested, or the type of service to be provided. It MAY be used
-  in both Access-Request and Access-Accept packets. A NAS is not
-  required to implement all of these service types, and MUST treat
-  unknown or unsupported Service-Types as though an Access-Reject
-  had been received instead.
-
-  Possible values are.
-
-1 Login
-2 Framed
-3 Callback Login
-4 Callback Framed
-5 Outbound
-6 Administrative
-7 NAS Prompt
-8 Authenticate Only
-9 Callback NAS Prompt
-
-  The service types are defined as follows when used in an Access-
-  Accept.  When used in an Access-Request, they should be considered
-  to be a hint to the RADIUS server that the NAS has reason to
-  believe the user would prefer the kind of service indicated, but
-  the server is not required to honor the hint.
-
-      Login               The user should be connected to a host.
-      Framed              A Framed Protocol should be started for the
-                          User, such as PPP or SLIP.
-      Callback Login      The user should be disconnected and called
-                          back, then connected to a host.
-      Callback Framed     The user should be disconnected and called
-                          back, then a Framed Protocol should be started
-                          for the User, such as PPP or SLIP.
-      Outbound            The user should be granted access to outgoing
-                          devices.
-      Administrative      The user should be granted access to the
-                          administrative interface to the NAS from which
-                          privileged commands can be executed.
-      NAS Prompt          The user should be provided a command prompt
-                          on the NAS from which non-privileged commands
-                          can be executed.
-      Authenticate Only   Only Authentication is requested, and no
-                          authorization information needs to be returned
-                          in the Access-Accept (typically used by proxy
-                          servers rather than the NAS itself).
-      Callback NAS Prompt The user should be disconnected and called
-                          back, then provided a command prompt on the
-                          NAS from which non-privileged commands can be
-                          executed.
-
-
-Close Window -
-
- - + + +Service-Type Help Page + + + +
+ + + + + +
+ + +
Service-Type Help Page 
+
+ + + + +
+
+
+
+  This Attribute indicates the type of service the user has
+  requested, or the type of service to be provided. It MAY be used
+  in both Access-Request and Access-Accept packets. A NAS is not
+  required to implement all of these service types, and MUST treat
+  unknown or unsupported Service-Types as though an Access-Reject
+  had been received instead.
+
+  Possible values are.
+
+1 Login
+2 Framed
+3 Callback Login
+4 Callback Framed
+5 Outbound
+6 Administrative
+7 NAS Prompt
+8 Authenticate Only
+9 Callback NAS Prompt
+
+  The service types are defined as follows when used in an Access-
+  Accept.  When used in an Access-Request, they should be considered
+  to be a hint to the RADIUS server that the NAS has reason to
+  believe the user would prefer the kind of service indicated, but
+  the server is not required to honor the hint.
+
+      Login               The user should be connected to a host.
+      Framed              A Framed Protocol should be started for the
+                          User, such as PPP or SLIP.
+      Callback Login      The user should be disconnected and called
+                          back, then connected to a host.
+      Callback Framed     The user should be disconnected and called
+                          back, then a Framed Protocol should be started
+                          for the User, such as PPP or SLIP.
+      Outbound            The user should be granted access to outgoing
+                          devices.
+      Administrative      The user should be granted access to the
+                          administrative interface to the NAS from which
+                          privileged commands can be executed.
+      NAS Prompt          The user should be provided a command prompt
+                          on the NAS from which non-privileged commands
+                          can be executed.
+      Authenticate Only   Only Authentication is requested, and no
+                          authorization information needs to be returned
+                          in the Access-Accept (typically used by proxy
+                          servers rather than the NAS itself).
+      Callback NAS Prompt The user should be disconnected and called
+                          back, then provided a command prompt on the
+                          NAS from which non-privileged commands can be
+                          executed.
+
+
+Close Window +
+
+ + diff --git a/raddb/sql/oracle/msqlippool.txt b/raddb/sql/oracle/msqlippool.txt index 3a5758a02ad..598900df060 100644 --- a/raddb/sql/oracle/msqlippool.txt +++ b/raddb/sql/oracle/msqlippool.txt @@ -1,41 +1,41 @@ -CREATE OR REPLACE FUNCTION msqlippool(user varchar2, pool varchar2) -RETURN varchar2 IS - - PRAGMA AUTONOMOUS_TRANSACTION; - ip_temp varchar2(20); -BEGIN - - -- If the user's pool is dynamic, get an ipaddress (oldest one) from the corresponding pool - - if pool = 'Dynamic' then - select framedipaddress into ip_temp from (select framedipaddress from radippool where expiry_time < current_timestamp and pool_name = pool ORDER BY expiry_time) where rownum = 1; - return (ip_temp); - - -- Else, then get the static ipaddress for that user from the corresponding pool - - else - select framedipaddress into ip_temp from radippool where username = user and pool_name = pool; - return (ip_temp); - end if; - -exception - - -- This block is executed if there's no free ipaddresses or no static ip assigned to the user - - when NO_DATA_FOUND then - if pool = 'Dynamic' then - return(''); -- so sqlippool can log it on radius.log - end if; - - -- Else, grabs a free IP from the static pool and saves it in radippool so the user will always get the same IP the next time - - select framedipaddress into ip_temp from (select framedipaddress from radippool where expiry_time < current_timestamp and username is null and pool_name = pool) where rownum = 1; - UPDATE radippool SET username = user where framedipaddress = ip_temp; - commit; - return (ip_temp); - - when others - then return('Oracle Exception'); - -END; -/ +CREATE OR REPLACE FUNCTION msqlippool(user varchar2, pool varchar2) +RETURN varchar2 IS + + PRAGMA AUTONOMOUS_TRANSACTION; + ip_temp varchar2(20); +BEGIN + + -- If the user's pool is dynamic, get an ipaddress (oldest one) from the corresponding pool + + if pool = 'Dynamic' then + select framedipaddress into ip_temp from (select framedipaddress from radippool where expiry_time < current_timestamp and pool_name = pool ORDER BY expiry_time) where rownum = 1; + return (ip_temp); + + -- Else, then get the static ipaddress for that user from the corresponding pool + + else + select framedipaddress into ip_temp from radippool where username = user and pool_name = pool; + return (ip_temp); + end if; + +exception + + -- This block is executed if there's no free ipaddresses or no static ip assigned to the user + + when NO_DATA_FOUND then + if pool = 'Dynamic' then + return(''); -- so sqlippool can log it on radius.log + end if; + + -- Else, grabs a free IP from the static pool and saves it in radippool so the user will always get the same IP the next time + + select framedipaddress into ip_temp from (select framedipaddress from radippool where expiry_time < current_timestamp and username is null and pool_name = pool) where rownum = 1; + UPDATE radippool SET username = user where framedipaddress = ip_temp; + commit; + return (ip_temp); + + when others + then return('Oracle Exception'); + +END; +/ diff --git a/share/dictionary.freeswitch b/share/dictionary.freeswitch index bd67e7786eb..bbe909c21fc 100644 --- a/share/dictionary.freeswitch +++ b/share/dictionary.freeswitch @@ -5,7 +5,7 @@ # # cparker@segv.org # -# Version: $Id: $ +# Version: $Id$ # VENDOR Freeswitch 27880