*sigh* These are the changes to the way radiusd.conf is created. I'm not

certain they're all good ideas.  At best, whitespace needs to be cleaned up
in the resultant file.

diff --git a/Makefile b/Makefile
index f991a00..3fa7d80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ install:
        $(INSTALL) -d -m 755    $(R)$(raddbdir); \
        cd raddb; \
        for i in [a-c]* [e-z]*; do \
-               [ $$i != radiusd.conf.in -a ! -f $(R)$(raddbdir)/$$i ] && \
+               [ $$i != radiusd.conf.m4.in -a $$i != radiusd.conf.m4 -a ! -f $(R)$(raddbdir)/$$i ] && \
                 $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
        done; \
        for i in dictionary*; do \

diff --git a/configure.in b/configure.in
index 973ff6a..2b9b63f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -256,6 +256,7 @@ fi
 AC_PATH_PROG(SNMPGET, snmpget, /usr/local/bin/snmpget)
 AC_PATH_PROG(SNMPWALK, snmpwalk, /usr/local/bin/snmpwalk)
 AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers)
+AC_CHECK_PROG(M4, m4, m4, /bin/false)
 
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
@@ -611,10 +612,11 @@ AC_OUTPUT(\
        ./scripts/rc.radiusd \
        ./scripts/radwatch \
        ./scripts/check-radiusd-config \
-       ./raddb/radiusd.conf
+       ./raddb/radiusd.conf.m4
 )
 
 AC_OUTPUT_COMMANDS([echo timestamp > src/include/stamp-h])
 AC_OUTPUT_COMMANDS([(cd ./src/include && /bin/sh ./build-radpaths-h)])
 AC_OUTPUT_COMMANDS([(cd ./src/main   && chmod +x checkrad.pl radlast radtest)])
 AC_OUTPUT_COMMANDS([(cd ./scripts    && chmod +x rc.radiusd radwatch check-radiusd-config)])
+AC_OUTPUT_COMMANDS([(cd ./raddb      && ${M4} ../processradconf.m4 ../src/modules/rlm_*/selfconfig.m4 radiusd.conf.m4 >radiusd.conf.new && mv radiusd.conf.new radiusd.conf)])

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.m4.in
similarity index 61%
rename from raddb/radiusd.conf.in
rename to raddb/radiusd.conf.m4.in
index 8d02a52..58655cd 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.m4.in
@@ -1,3 +1,7 @@
+dnl
+dnl  M4 code copyright 2000, Chad Miller and others
+dnl
+dnl
 ##
 ## radiusd.conf        -- FreeRADIUS server configuration file.
 ##
@@ -331,310 +335,12 @@ thread pool {
 }
 
 modules {
-       pam {
-               #
-               #  The name to use for PAM authentication.
-               #  PAM looks in /etc/pam.d/${pam_auth_name}
-               #  for it's configuration.
-               #
-               #  Note that any Pam-Auth attribute set in the 'users'
-               #  file over-rides this one.
-               #
-               pam_auth = radiusd
-       }
-       unix {
-               #
-               #  Cache /etc/passwd, /etc/shadow, and /etc/group
-               #
-               #  The default is to NOT cache them.  However, caching them can
-               #  speed up system authentications by a substantial amount.
-               #
-               # allowed values: {no, yes}
-               cache           = no
-
-               #
-               #  Define the locations of the normal passwd, shadow, and
-               #  group files.
-               #
-               #  'shadow' is commented out by default, because not all
-               #  systems have shadow passwords.
-               #
-               passwd          = /etc/passwd
-               #       shadow          = /etc/shadow
-               group           = /etc/group
-
-
-               #
-               #  Where the 'wtmp' file is located.
-               #  This will be moved to it's own module soon..
-               #
-               radwtmp = ${logdir}/radwtmp
-       }
-
-# Uncomment this if you want to use ldap (Auth-Type = LDAP)
-# Also uncomment it in the authenticate{} block below
-#      ldap {
-#              server   = localhost
-#              login    = "cn=admin,o=My Org,c=US"
-#              password = mypass
-#              basedn   = "o=My Org,c=US"
-#              filter   = "(uid=%u)"
-#      }
-
-       #
-       #  You can have multiple instances of the realm module to
-       #  support multiple realm syntaxs at the same time.  The
-       #  search order is defined the order in the authorize and
-       #  preacct blocks after the module config block.
-       #
-       #  Two config options:
-       #       format     -  must be 'prefix' or 'suffix'
-       #       delimiter  -  must be a single character
-       #
-       #  'username@realm'
-       #
-       realm suffix {
-               format = suffix
-               delimiter = "@"
-       }
-
-       #
-       #  'realm/username'
-       #
-       #  Using this entry, IPASS users have their realm set to "IPASS".
-       #
-       #realm prefix {
-       #       format = prefix
-       #       delimiter = "/"
-       #}
-
-       #
-       #  'username%realm'
-       #
-       #realm percent {
-       #       format = suffix
-       #       delimiter = "%"
-       #}
-       
-
-       preprocess {
-               huntgroups = ${confdir}/huntgroups
-               hints = ${confdir}/hints
-
-               #
-               # This hack changes Ascend's wierd port numberings
-               # to standard 0-??? port numbers so that the "+" works
-               # for IP address assignments.
-               #
-               with_ascend_hack = no
-               ascend_channels_per_line = 23
-
-               #
-               # Windows NT machines often authenticate themselves as
-               # NT_DOMAIN\username
-               #
-               # If this is set to 'yes', then the NT_DOMAIN portion
-               # of the user-name is silently discarded.
-               #
-               with_ntdomain_hack = no
-
-               #
-               # Specialix Jetstream 8500 24 port access server.
-               #
-               # If the user name is 10 characters or longer, a "/"
-               # and the excess characters after the 10th are
-               # appended to the user name.
-               #
-               # If you're not running that NAS, you don't need
-               # this hack.
-               #
-               with_specialix_jetstream_hack = no
-       }
-       files {
-               usersfile = ${confdir}/users
-               acctusersfile = ${confdir}/acct_users
-
-               #
-               #  If you want to use the old Cistron 'users' file
-               #  with FreeRADIUS, you should change the next line
-               #  to 'compat = cistron'.  You can the copy your 'users'
-               #  file from Cistron.
-               #
-               compat = no
-       }
-
-       # See README.rlm_fastusers before using this
-       # module or changing these values.
-       fastusers {
-               usersfile = ${confdir}/users_fast
-               hashsize = 1000
-               compat = no
-               # Reload the hash every 600 seconds (10mins)
-               reload_hash = 600
-       }
-       
-       detail {
-               detailfile = ${radacctdir}/%n/detail
-               detailperm = 0600
-       }
-
-       # This module will add a (probably) unique session id 
-       # to an accounting packet based on the attributes listed
-       # below found in the packet.  see doc/README.rlm_acct_unique
-       acct_unique {
-               key = "User-Name, Acct-Session-Id, NAS-IP-Address, NAS-Port-Id"
-       }
-
-
-#
-#  Configuration for the SQL module.
-#
-       sql {
-       
-               # Connect info
-               server          = "localhost"
-               login           = "root"
-               password        = "rootpass"
-               
-               # Database table configuration
-               radius_db       = "radius"
-               acct_table      = "radacct"
-               
-               authcheck_table = "radcheck"
-               authreply_table = "radreply"
-               
-               groupcheck_table = "radgroupcheck"
-               groupreply_table = "radgroupreply"
-               
-               usergroup_table = "usergroup"
-               
-               realms_table    = "realms"
-               realmgroup_table = "realmgroup"
-               
-               # Check case on usernames
-               sensitiveusername = no
-       
-               # Remove stale session if checkrad does not see a double login
-               deletestalesessions = yes
-       
-               # Print all SQL statements when in debug mode (-x)
-               sqltrace        = no
-               sqltracefile = ${logdir}/sqltrace.sql
-
-               # number of sql connections to make to server
-               num_sql_socks = 5
-       }
-
-#
-#  A second instance of the same module, with the name "sql2" to identify it
-#
-       sql sql2 {
-       
-               # Connect info
-               server          = "myothersever"
-               login           = "root"
-               password        = "rootpass"
-               
-               # Database table configuration
-               radius_db       = "radius"
-               acct_table      = "radacct"
-               
-               authcheck_table = "radcheck"
-               authreply_table = "radreply"
-               
-               groupcheck_table = "radgroupcheck"
-               groupreply_table = "radgroupreply"
-               
-               usergroup_table = "usergroup"
-               
-               realms_table    = "realms"
-               realmgroup_table = "realmgroup"
-               
-               # Check case on usernames
-               sensitiveusername = no
-       
-               # Remove stale session if checkrad does not see a double login
-               deletestalesessions = yes
-       
-               # Print all SQL statements when in debug mode (-x)
-               sqltrace        = no
-       }
-
-#
-# The "always" module is here for debugging purposes. Each instance simply
-# returns the same result, always, without doing anything.
-#
-       always fail {
-               rcode = fail
-       }
-       always reject {
-               rcode = reject
-       }
-       always ok {
-               rcode = ok
-               simulcount = 0
-               mpp = no
-       }
-
-#######################################################################
-#
-#      Configuration for the example module.  Uncommenting it will cause it
-#      to get loaded and initialized, but should have no real effect as long
-#      it is not referencened in one of the autz/auth/preacct/acct sections
-#
-       example {
-       #
-       #  Boolean variable.
-       #
-       # allowed values: {no, yes}
-       #
-               boolean         = yes
-
-       #
-       #  An integer, of any value.
-       #
-               integer         = 16
-
-       #
-       #  A string.
-       #
-               string          = "This is an example configuration string"
-
-       #
-       # An IP address, either in dotted quad (1.2.3.4) or hostname
-       # (example.com)
-       #
-               ipaddr          = 127.0.0.1
-
-       #
-       # A subsection
-       #
-               mysubsection {
-                       anotherinteger = 1000
-       #
-       # They nest
-       #
-                       deeply nested {
-                               string = "This is a different string"
-                       }
-               }
-       }
+PLACE_MODULES
 }
 
 # Authentication types, Auth-Type = System and PAM for now.
 authenticate {
-       pam
-       unix
-# By grouping modules together in an authtype block, that authtype will be
-# tried on each module in sequence until one returns REJECT or OK. This
-# allows authentication failover if the first SQL server has crashed, for
-# example.
-#       authtype SQL {
-#              sql
-#              sql2
-#       }
-# Uncomment this if you want to use ldap (Auth-Type = LDAP)
-#      ldap
+PLACE_AUTHENTICATION
 }
 
 # Authorization. First preprocess (hints and huntgroups files),
@@ -644,28 +350,22 @@ authenticate {
 # Make *sure* that 'preprocess' comes before any realm if you 
 # need to setup hints for the remote radius server
 authorize {
-       preprocess
-       suffix
-       files
+PLACE_AUTHORIZATION
 }
 
 # Pre-accounting. Look for proxy realm in order of realms, then 
 # acct_users file, then preprocess (hints file).
 preacct {
-       suffix
-       files
-       preprocess
+PLACE_PREACCOUNTING
 }
 
 # Accounting. Log to detail file, and to the radwtmp file.
 accounting {
-       #acct_unique
-       detail
-       unix
+PLACE_ACCOUNTING
 }
 
 # Session database, used for checking Simultaneous-Use. The radutmp module
 # handles this
 session {
-#       radutmp
+PLACE_SESSIONING
 }

diff --git a/src/modules/rlm_acct_unique/selfconfig.m4 b/src/modules/rlm_acct_unique/selfconfig.m4
new file mode 100644 (file)
index 0000000..e2c3d6d
--- /dev/null
+++ b/src/modules/rlm_acct_unique/selfconfig.m4
@@ -0,0 +1,22 @@
+dnl  this is included in 
+dnl
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       # This module will add a (probably) unique session id 
+       # to an accounting packet based on the attributes listed
+       # below found in the packet.  see doc/README.rlm_acct_unique
+       acct_unique {
+               key = "User-Name, Acct-Session-Id, NAS-IP-Address, NAS-Port-Id"
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+       # acct_unique
+INSERT_DEF_SESSION(5)dnl

diff --git a/src/modules/rlm_detail/selfconfig.m4 b/src/modules/rlm_detail/selfconfig.m4
new file mode 100644 (file)
index 0000000..faa4d48
--- /dev/null
+++ b/src/modules/rlm_detail/selfconfig.m4
@@ -0,0 +1,21 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       detail {
+               detailfile = ${radacctdir}/%n/detail
+               detailperm = 0600
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+       detail
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_dictionary/selfconfig.m4 b/src/modules/rlm_dictionary/selfconfig.m4
new file mode 100644 (file)
index 0000000..3cf4872
--- /dev/null
+++ b/src/modules/rlm_dictionary/selfconfig.m4
@@ -0,0 +1,17 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_example/selfconfig.m4 b/src/modules/rlm_example/selfconfig.m4
new file mode 100644 (file)
index 0000000..66405b6
--- /dev/null
+++ b/src/modules/rlm_example/selfconfig.m4
@@ -0,0 +1,59 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+#######################################################################
+#
+#  Configuration for the example module.  Uncommenting it will cause it
+#  to get loaded and initialized, but should have no real effect as long
+#  it is not referencened in one of the autz/auth/preacct/acct sections
+#
+       example {
+       #
+       #  Boolean variable.
+       #
+       # allowed values: {no, yes}
+       #
+               boolean = yes
+
+       #
+       #  An integer, of any value.
+       #
+               integer = 16
+
+       #
+       #  A string.
+       #
+               string = "This is an example configuration string"
+
+       #
+       # An IP address, either in dotted quad (1.2.3.4) or hostname
+       # (example.com)
+       #
+               ipaddr = 127.0.0.1
+
+       #
+       # A subsection
+       #
+               mysubsection {
+                       anotherinteger = 1000
+       #
+       # They nest
+       #
+                       deeply nested {
+                               string = "This is a different string"
+                       }
+               }
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_fastusers/selfconfig.m4 b/src/modules/rlm_fastusers/selfconfig.m4
new file mode 100644 (file)
index 0000000..4d98c34
--- /dev/null
+++ b/src/modules/rlm_fastusers/selfconfig.m4
@@ -0,0 +1,26 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       # See README.rlm_fastusers before using this
+       # module or changing these values.
+       fastusers {
+               usersfile = ${confdir}/users_fast
+               hashsize = 1000
+               compat = no
+               # Reload the hash every 600 seconds (10mins)
+               reload_hash = 600
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_files/selfconfig.m4 b/src/modules/rlm_files/selfconfig.m4
new file mode 100644 (file)
index 0000000..84a700c
--- /dev/null
+++ b/src/modules/rlm_files/selfconfig.m4
@@ -0,0 +1,27 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       files {
+               usersfile = ${confdir}/users
+               acctusersfile = ${confdir}/acct_users
+
+               #  If you want to use the old Cistron 'users' file
+               #  with FreeRADIUS, you should change the next line
+               #  to 'compat = cistron'.  You can the copy your 'users'
+               #  file from Cistron.
+               compat = no
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+       files
+INSERT_DEF_PREACCOUNTING(5)dnl
+       files
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_krb5/selfconfig.m4 b/src/modules/rlm_krb5/selfconfig.m4
new file mode 100644 (file)
index 0000000..3cf4872
--- /dev/null
+++ b/src/modules/rlm_krb5/selfconfig.m4
@@ -0,0 +1,17 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_ldap/selfconfig.m4 b/src/modules/rlm_ldap/selfconfig.m4
new file mode 100644 (file)
index 0000000..3692b12
--- /dev/null
+++ b/src/modules/rlm_ldap/selfconfig.m4
@@ -0,0 +1,26 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       # Uncomment this if you want to use ldap (Auth-Type = LDAP)
+       # Also uncomment it in the authenticate{} block below
+       #ldap {
+       #       server = localhost
+       #       login = "cn=admin,o=My Org,c=US"
+       #       password = mypass
+       #       basedn = "o=My Org,c=US"
+       #       filter = "(uid=%u)"
+       #}
+INSERT_DEF_AUTHENTICATION(5)dnl
+       #ldap
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_mschap/selfconfig.m4 b/src/modules/rlm_mschap/selfconfig.m4
new file mode 100644 (file)
index 0000000..3cf4872
--- /dev/null
+++ b/src/modules/rlm_mschap/selfconfig.m4
@@ -0,0 +1,17 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_ns_mta_md5/selfconfig.m4 b/src/modules/rlm_ns_mta_md5/selfconfig.m4
new file mode 100644 (file)
index 0000000..3cf4872
--- /dev/null
+++ b/src/modules/rlm_ns_mta_md5/selfconfig.m4
@@ -0,0 +1,17 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_pam/selfconfig.m4 b/src/modules/rlm_pam/selfconfig.m4
new file mode 100644 (file)
index 0000000..3949cba
--- /dev/null
+++ b/src/modules/rlm_pam/selfconfig.m4
@@ -0,0 +1,28 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       pam {
+               #
+               #  The name to use for PAM authentication.
+               #  PAM looks in /etc/pam.d/${pam_auth_name}
+               #  or /etc/pam.conf for it's configuration.
+               #
+               #  Note that any Pam-Auth attribute set in the 'users'
+               #  file over-rides this one.
+               #
+               pam_auth = radiusd
+       }
+INSERT_DEF_AUTHENTICATION(4)dnl earlier than unix
+       pam
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_preprocess/selfconfig.m4 b/src/modules/rlm_preprocess/selfconfig.m4
new file mode 100644 (file)
index 0000000..d8ed75c
--- /dev/null
+++ b/src/modules/rlm_preprocess/selfconfig.m4
@@ -0,0 +1,50 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       preprocess {
+               huntgroups = ${confdir}/huntgroups
+               hints = ${confdir}/hints
+
+               #
+               # This hack changes Ascend's wierd port numberings
+               # to standard 0-??? port numbers so that the "+" works
+               # for IP address assignments.
+               #
+               with_ascend_hack = no
+               ascend_channels_per_line = 23
+
+               #
+               # Windows NT machines often authenticate themselves as
+               # NT_DOMAIN\username
+               #
+               # If this is set to 'yes', then the NT_DOMAIN portion
+               # of the user-name is silently discarded.
+               #
+               with_ntdomain_hack = no
+
+               #
+               # Specialix Jetstream 8500 24 port access server.
+               #
+               # If the user name is 10 characters or longer, a "/"
+               # and the excess characters after the 10th are
+               # appended to the user name.
+               #
+               # If you're not running that NAS, you don't need
+               # this hack.
+               #
+               with_specialix_jetstream_hack = no
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(8)dnl
+       preprocess
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_radutmp/selfconfig.m4 b/src/modules/rlm_radutmp/selfconfig.m4
new file mode 100644 (file)
index 0000000..74b2762
--- /dev/null
+++ b/src/modules/rlm_radutmp/selfconfig.m4
@@ -0,0 +1,20 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       # Needs definition.
+       # radutmp {
+       # }
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(6)dnl
+       # radutmp

diff --git a/src/modules/rlm_realm/selfconfig.m4 b/src/modules/rlm_realm/selfconfig.m4
new file mode 100644 (file)
index 0000000..c1bbdfe
--- /dev/null
+++ b/src/modules/rlm_realm/selfconfig.m4
@@ -0,0 +1,50 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       #  You can have multiple instances of the realm module to
+       #  support multiple realm syntaxs at the same time.  The
+       #  search order is defined the order in the authorize and
+       #  preacct blocks after the module config block.
+       #
+       #  Two config options:
+       #       format     -  must be 'prefix' or 'suffix'
+       #       delimiter  -  must be a single character
+       #
+       #  'username@realm'
+       #
+       realm suffix {
+               format = suffix
+               delimiter = "@"
+       }
+
+       #
+       #  'realm/username'
+       #
+       #  Using this entry, IPASS users have their realm set to "IPASS".
+       #
+       #realm prefix {
+       #       format = prefix
+       #       delimiter = "/"
+       #}
+
+       #
+       #  'username%realm'
+       #
+       #realm percent {
+       #       format = suffix
+       #       delimiter = "%"
+       #}
+INSERT_DEF_AUTHENTICATION(5)dnl
+dnl nothing
+INSERT_DEF_AUTHORIZATION(1)dnl  important that it come early
+       suffix
+INSERT_DEF_PREACCOUNTING(1)dnl
+       suffix
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_sql/selfconfig.m4 b/src/modules/rlm_sql/selfconfig.m4
new file mode 100644 (file)
index 0000000..26f5ec3
--- /dev/null
+++ b/src/modules/rlm_sql/selfconfig.m4
@@ -0,0 +1,96 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       #  Configuration for the SQL module.
+       #
+       sql {
+               # Connect info
+               server          = "localhost"
+               login           = "root"
+               password        = "rootpass"
+
+               # Database table configuration
+               radius_db       = "radius"
+               acct_table      = "radacct"
+
+               authcheck_table = "radcheck"
+               authreply_table = "radreply"
+
+               groupcheck_table = "radgroupcheck"
+               groupreply_table = "radgroupreply"
+
+               usergroup_table = "usergroup"
+
+               realms_table    = "realms"
+               realmgroup_table = "realmgroup"
+
+               # Check case on usernames
+               sensitiveusername = no
+
+               # Remove stale session if checkrad does not see a double login
+               deletestalesessions = yes
+
+               # Print all SQL statements when in debug mode (-x)
+               sqltrace        = no
+               sqltracefile = ${logdir}/sqltrace.sql
+
+               # number of sql connections to make to server
+               num_sql_socks = 5
+       }
+
+       #
+       #  A second instance of the same module, with the name "sql2" to identify it
+       #
+       sql sql2 {
+       
+               # Connect info
+               server = "myothersever"
+               login = "root"
+               password = "rootpass"
+               
+               # Database table configuration
+               radius_db = "radius"
+               acct_table = "radacct"
+               
+               authcheck_table = "radcheck"
+               authreply_table = "radreply"
+               
+               groupcheck_table = "radgroupcheck"
+               groupreply_table = "radgroupreply"
+               
+               usergroup_table = "usergroup"
+               
+               realms_table = "realms"
+               realmgroup_table = "realmgroup"
+               
+               # Check case on usernames
+               sensitiveusername = no
+       
+               # Remove stale session if checkrad does not see a double login
+               deletestalesessions = yes
+       
+               # Print all SQL statements when in debug mode (-x)
+               sqltrace = no
+       }
+INSERT_DEF_AUTHENTICATION(5)dnl
+       #
+       # By grouping modules together in an authtype block, that authtype will be
+       # tried on each module in sequence until one returns REJECT or OK. This
+       # allows authentication failover if the first SQL server has crashed, for
+       # example.
+       #authtype SQL {
+       #       sql
+       #       sql2
+       #}
+INSERT_DEF_AUTHORIZATION(5)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_SESSION(5)dnl
+dnl nothing

diff --git a/src/modules/rlm_unix/selfconfig.m4 b/src/modules/rlm_unix/selfconfig.m4
new file mode 100644 (file)
index 0000000..3b21cc3
--- /dev/null
+++ b/src/modules/rlm_unix/selfconfig.m4
@@ -0,0 +1,44 @@
+dnl  There's no runtime magic here.  This is included at compile time to make
+dnl  a default etc/raddb/radiusd.conf for installation.
+dnl
+INSERT_GLOBAL_CONFIG(5)dnl
+dnl nothing
+INSERT_MODULE_INSTANTIATION(5)dnl
+       #
+       unix {
+               #
+               #  Cache /etc/passwd, /etc/shadow, and /etc/group
+               #
+               #  The default is to NOT cache them.  However, caching them can
+               #  speed up system authentications by a substantial amount.
+               #
+               # allowed values: {no, yes}
+               cache = no
+
+               #
+               #  Define the locations of the normal passwd, shadow, and
+               #  group files.
+               #
+               #  'shadow' is commented out by default, because not all
+               #  systems have shadow passwords.
+               #
+               passwd = /etc/passwd
+               #       shadow = /etc/shadow
+               group = /etc/group
+
+               #
+               #  Where the 'wtmp' file is located.
+               #  This will be moved to it's own module soon..
+               #
+               radwtmp = ${logdir}/radwtmp
+       }
+INSERT_DEF_AUTHENTICATION(8)dnl  this should come late, as it's inefficient
+       unix
+INSERT_DEF_AUTHORIZATION(6)dnl
+dnl nothing
+INSERT_DEF_PREACCOUNTING(5)dnl
+dnl nothing
+INSERT_DEF_ACCOUNTING(5)dnl
+       unix
+INSERT_DEF_SESSION(5)dnl
+dnl nothing