"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "raddb/mods-config/sql/main/oracle/queries.conf" between
freeradius-server-3.0.22.tar.bz2 and freeradius-server-3.0.23.tar.bz2

About: FreeRADIUS Server Project - a high performance and highly configurable RADIUS server.

queries.conf  (freeradius-server-3.0.22.tar.bz2):queries.conf  (freeradius-server-3.0.23.tar.bz2)
# -*- text -*- # -*- text -*-
# #
# main/oracle/queries.conf -- Oracle configuration for default schema (schema.s ql) # main/oracle/queries.conf -- Oracle configuration for default schema (schema.s ql)
# #
# $Id: fa34d8eff1e9dc28b5eebabe80e53d5ef6b63b75 $ # $Id: ad33d34c2bc15c470c1f331eaea2bd754c69bdf6 $
####################################################################### #######################################################################
# Query config: Username # Query config: Username
####################################################################### #######################################################################
# This is the username that will get substituted, escaped, and added # This is the username that will get substituted, escaped, and added
# as attribute 'SQL-User-Name'. '%{SQL-User-Name}' should be used below # as attribute 'SQL-User-Name'. '%{SQL-User-Name}' should be used below
# everywhere a username substitution is needed so you you can be sure # everywhere a username substitution is needed so you you can be sure
# the username passed from the client is escaped properly. # the username passed from the client is escaped properly.
# #
# Uncomment the next line, if you want the sql_user_name to mean: # Uncomment the next line, if you want the sql_user_name to mean:
skipping to change at line 44 skipping to change at line 44
#event_timestamp_epoch = "%l" #event_timestamp_epoch = "%l"
event_timestamp_epoch = "%{%{integer:Event-Timestamp}:-%l}" event_timestamp_epoch = "%{%{integer:Event-Timestamp}:-%l}"
# event_timestamp is the SQL snippet for converting an epoch timestamp # event_timestamp is the SQL snippet for converting an epoch timestamp
# to an SQL date. # to an SQL date.
event_timestamp = "TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(${event_ timestamp_epoch},'SECOND')" event_timestamp = "TO_DATE('1970-01-01','YYYY-MM-DD') + NUMTODSINTERVAL(${event_ timestamp_epoch},'SECOND')"
####################################################################### #######################################################################
# Query config: Class attribute
#######################################################################
#
# 3.0.22 and later have a "class" column in the accounting table.
#
# However, we do NOT want to break existing configurations by adding
# the Class attribute to the default queries. If we did that, then
# systems using newer versions of the server would fail, because
# there is no "class" column in their accounting tables.
#
# The solution to that is the following "class" subsection. If your
# database has a "class" column for the various tables, then you can
# uncomment the configuration items here. The queries below will
# then automatically insert the Class attribute into radacct,
# radpostauth, etc.
#
class {
#
# Delete the '#' character from each of the configuration
# items in this section. This change puts the Class
# attribute into the various tables. Leave the double-quoted
# string there, as the value for the configuration item.
#
# See also policy.d/accounting, and the "insert_acct_class"
# policy. You will need to list (or uncomment)
# "insert_acct_class" in the "post-auth" section in order to
# create a Class attribute.
#
column_name = # ", class"
packet_xlat = # ", '%{Class}'"
reply_xlat = # ", '%{Reply:Class}'"
}
#######################################################################
# Default profile # Default profile
####################################################################### #######################################################################
# This is the default profile. It is found in SQL by group membership. # This is the default profile. It is found in SQL by group membership.
# That means that this profile must be a member of at least one group # That means that this profile must be a member of at least one group
# which will contain the corresponding check and reply items. # which will contain the corresponding check and reply items.
# This profile will be queried in the authorize section for every user. # This profile will be queried in the authorize section for every user.
# The point is to assign all users a default profile without having to # The point is to assign all users a default profile without having to
# manually add each one to a group that will contain the profile. # manually add each one to a group that will contain the profile.
# The SQL module will also honor the User-Profile attribute. This # The SQL module will also honor the User-Profile attribute. This
# attribute can be set anywhere in the authorize section (ie the users # attribute can be set anywhere in the authorize section (ie the users
skipping to change at line 323 skipping to change at line 357
AcctTerminateCause, \ AcctTerminateCause, \
ServiceType, \ ServiceType, \
FramedProtocol, \ FramedProtocol, \
FramedIPAddress, \ FramedIPAddress, \
FramedIPv6Address, \ FramedIPv6Address, \
FramedIPv6Prefix, \ FramedIPv6Prefix, \
FramedInterfaceId, \ FramedInterfaceId, \
DelegatedIPv6Prefix, \ DelegatedIPv6Prefix, \
AcctStartDelay, \ AcctStartDelay, \
AcctStopDelay, \ AcctStopDelay, \
XAscendSessionSvrKey) \ XAscendSessionSvrKey \
${..class.column_name}) \
VALUES(\ VALUES(\
'', \ '', \
'%{Acct-Session-Id}', \ '%{Acct-Session-Id}', \
'%{Acct-Unique-Session-Id}', \ '%{Acct-Unique-Session-Id}', \
'%{SQL-User-Name}', \ '%{SQL-User-Name}', \
'%{Realm}', \ '%{Realm}', \
'%{NAS-IP-Address}', \ '%{NAS-IP-Address}', \
'%{%{NAS-Port-ID}:-%{NAS-Port}}', \ '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
'%{NAS-Port-Type}', \ '%{NAS-Port-Type}', \
${....event_timestamp}, \ ${....event_timestamp}, \
skipping to change at line 353 skipping to change at line 388
'', \ '', \
'%{Service-Type}', \ '%{Service-Type}', \
'%{Framed-Protocol}', \ '%{Framed-Protocol}', \
'%{Framed-IP-Address}', \ '%{Framed-IP-Address}', \
'%{Framed-IPv6-Address}', \ '%{Framed-IPv6-Address}', \
'%{Framed-IPv6-Prefix}', \ '%{Framed-IPv6-Prefix}', \
'%{Framed-Interface-Id}', \ '%{Framed-Interface-Id}', \
'%{Delegated-IPv6-Prefix}', \ '%{Delegated-IPv6-Prefix}', \
'%{Acct-Delay-Time}', \ '%{Acct-Delay-Time}', \
'0', \ '0', \
'%{X-Ascend-Session-Svr-Key}')" '%{X-Ascend-Session-Svr-Key}' \
${....class.packet_xlat})"
# #
# When using "sql_session_start", you should comment out # When using "sql_session_start", you should comment out
# the previous query, and enable this one. # the previous query, and enable this one.
# #
# Just change the previous query to "-query", # Just change the previous query to "-query",
# and this one to "query". The previous one # and this one to "query". The previous one
# will be ignored, and this one will be # will be ignored, and this one will be
# enabled. # enabled.
# #
skipping to change at line 439 skipping to change at line 475
CalledStationId, \ CalledStationId, \
CallingStationId, \ CallingStationId, \
ServiceType, \ ServiceType, \
FramedProtocol, \ FramedProtocol, \
FramedIPAddress, \ FramedIPAddress, \
FramedIPv6Address, \ FramedIPv6Address, \
FramedIPv6Prefix, \ FramedIPv6Prefix, \
FramedInterfaceId, \ FramedInterfaceId, \
DelegatedIPv6Prefix, \ DelegatedIPv6Prefix, \
AcctStartDelay, \ AcctStartDelay, \
XAscendSessionSvrKey) \ XAscendSessionSvrKey \
${..class.column_name}) \
VALUES(\ VALUES(\
'', \ '', \
'%{Acct-Session-Id}', \ '%{Acct-Session-Id}', \
'%{Acct-Unique-Session-Id}', \ '%{Acct-Unique-Session-Id}', \
'%{SQL-User-Name}', \ '%{SQL-User-Name}', \
'%{Realm}', \ '%{Realm}', \
'%{NAS-IP-Address}', \ '%{NAS-IP-Address}', \
'%{%{NAS-Port-ID}:-%{NAS-Port}}', \ '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
'%{NAS-Port-Type}', \ '%{NAS-Port-Type}', \
NULL, \ NULL, \
skipping to change at line 467 skipping to change at line 504
'%{Called-Station-Id}', \ '%{Called-Station-Id}', \
'%{Calling-Station-Id}', \ '%{Calling-Station-Id}', \
'%{Service-Type}', \ '%{Service-Type}', \
'%{Framed-Protocol}', \ '%{Framed-Protocol}', \
'%{Framed-IP-Address}', \ '%{Framed-IP-Address}', \
'%{Framed-IPv6-Address}', \ '%{Framed-IPv6-Address}', \
'%{Framed-IPv6-Prefix}', \ '%{Framed-IPv6-Prefix}', \
'%{Framed-Interface-Id}', \ '%{Framed-Interface-Id}', \
'%{Delegated-IPv6-Prefix}', \ '%{Delegated-IPv6-Prefix}', \
'0', \ '0', \
'%{X-Ascend-Session-Svr-Key}')" '%{X-Ascend-Session-Svr-Key}' \
${....class.packet_xlat})"
# #
# When using "sql_session_start", you should comment out # When using "sql_session_start", you should comment out
# the previous query, and enable this one. # the previous query, and enable this one.
# #
# Just change the previous query to "-query", # Just change the previous query to "-query",
# and this one to "query". The previous one # and this one to "query". The previous one
# will be ignored, and this one will be # will be ignored, and this one will be
# enabled. # enabled.
# #
skipping to change at line 550 skipping to change at line 588
CallingStationId, \ CallingStationId, \
AcctTerminateCause, \ AcctTerminateCause, \
ServiceType, \ ServiceType, \
FramedProtocol, \ FramedProtocol, \
FramedIPAddress, \ FramedIPAddress, \
FramedIPv6Address, \ FramedIPv6Address, \
FramedIPv6Prefix, \ FramedIPv6Prefix, \
FramedInterfaceId, \ FramedInterfaceId, \
DelegatedIPv6Prefix, \ DelegatedIPv6Prefix, \
AcctStartDelay, \ AcctStartDelay, \
AcctStopDelay) \ AcctStopDelay \
${..class.column_name}) \
VALUES(\ VALUES(\
'', \ '', \
'%{Acct-Session-Id}', \ '%{Acct-Session-Id}', \
'%{Acct-Unique-Session-Id}', \ '%{Acct-Unique-Session-Id}', \
'%{SQL-User-Name}', \ '%{SQL-User-Name}', \
'%{Realm}', \ '%{Realm}', \
'%{NAS-IP-Address}', \ '%{NAS-IP-Address}', \
'%{%{NAS-Port-ID}:-%{NAS-Port}}', \ '%{%{NAS-Port-ID}:-%{NAS-Port}}', \
'%{NAS-Port-Type}', \ '%{NAS-Port-Type}', \
NULL, \ NULL, \
skipping to change at line 582 skipping to change at line 621
'%{Calling-Station-Id}', \ '%{Calling-Station-Id}', \
'%{Acct-Terminate-Cause}', \ '%{Acct-Terminate-Cause}', \
'%{Service-Type}', \ '%{Service-Type}', \
'%{Framed-Protocol}', \ '%{Framed-Protocol}', \
'%{Framed-IP-Address}', \ '%{Framed-IP-Address}', \
'%{Framed-IPv6-Address}', \ '%{Framed-IPv6-Address}', \
'%{Framed-IPv6-Prefix}', \ '%{Framed-IPv6-Prefix}', \
'%{Framed-Interface-Id}', \ '%{Framed-Interface-Id}', \
'%{Delegated-IPv6-Prefix}', \ '%{Delegated-IPv6-Prefix}', \
'0', \ '0', \
'%{%{Acct-Delay-Time}:-0}')" '%{%{Acct-Delay-Time}:-0}' \
${....class.packet_xlat})"
# #
# When using "sql_session_start", you should comment out # When using "sql_session_start", you should comment out
# the previous query, and enable this one. # the previous query, and enable this one.
# #
# Just change the previous query to "-query", # Just change the previous query to "-query",
# and this one to "query". The previous one # and this one to "query". The previous one
# will be ignored, and this one will be # will be ignored, and this one will be
# enabled. # enabled.
# #
skipping to change at line 637 skipping to change at line 677
####################################################################### #######################################################################
# postauth_query - Insert some info after authentication # postauth_query - Insert some info after authentication
####################################################################### #######################################################################
post-auth { post-auth {
# Write SQL queries to a logfile. This is potentially useful for bulk ins erts # Write SQL queries to a logfile. This is potentially useful for bulk ins erts
# when used with the rlm_sql_null driver. # when used with the rlm_sql_null driver.
# logfile = ${logdir}/post-auth.sql # logfile = ${logdir}/post-auth.sql
query = "\ query = "\
INSERT INTO ${..postauth_table} \ INSERT INTO ${..postauth_table} \
(username, pass, reply, authdate) \ (username, pass, reply, authdate ${..class.column_name}) \
VALUES (\ VALUES (\
'%{User-Name}', \ '%{User-Name}', \
'%{%{User-Password}:-%{Chap-Password}}', \ '%{%{User-Password}:-%{Chap-Password}}', \
'%{reply:Packet-Type}', \ '%{reply:Packet-Type}', \
TO_TIMESTAMP('%S.%M','YYYY-MM-DDHH24:MI:SS.FF'))" TO_TIMESTAMP('%S.%M','YYYY-MM-DDHH24:MI:SS.FF') \
${..class.reply_xlat})"
} }
 End of changes. 10 change blocks. 
9 lines changed or deleted 50 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)