Be consistent with common config_item names

If a file is being referenced or created the config item 'filename' is used.

If a file is being created, the initial permissions are set by the 'permissions' config item.

If a directory hierarchy needs to be created the permissions are set by 'dir_permissions'

If an external host is referenced in the context of a module the 'server' config item is used.

file, script_file, module, detail, detailfile, attrsfile, perm, dirperm, detailperm,
hostname are all deprecated.

diff --git a/doc/configuration/acct_type.rst b/doc/configuration/acct_type.rst
index 0c8d3ad..698cfdf 100644 (file)
--- a/doc/configuration/acct_type.rst
+++ b/doc/configuration/acct_type.rst
@@ -35,7 +35,7 @@ And in radiusd.conf::
   $INCLUDE  ${confdir}/sql2.conf # Instance named 'sql2'.
   
   detail othernas {
-        detailfile = ${radacctdir}/10.0.0.1/detail-%Y%m%d
+        filename = ${radacctdir}/10.0.0.1/detail-%Y%m%d
   }
   
   preacct {

diff --git a/doc/modules/ldap_howto.rst b/doc/modules/ldap_howto.rst
index c15a448..82b4241 100644 (file)
--- a/doc/modules/ldap_howto.rst
+++ b/doc/modules/ldap_howto.rst
@@ -1170,9 +1170,9 @@ the machine.  The first one is done in a regular detail file as defined in the
 following::
 
     detail detail1 {
-    detailfile = ${radacctdir}/%{Client-IP-Address}/detail-%Y%m%d
-    detailperm = 0600
-    dirperm = 0755
+        filename = ${radacctdir}/%{Client-IP-Address}/detail-%Y%m%d
+        permissions = 0600
+        dir_permissions = 0755
     }
 
 The second detail file will be used by the program radrelay to relay a copy of
@@ -1186,11 +1186,11 @@ back online, an attempt to re-send the packets to the Accounting server will
 made.  This file is defined in the following section of radiusd.conf::
 
     detail detail2 {
-    detailfile= ${radacctdir}/detail-combined
-    detailperm = 0600
-    dirperm = 0755
-    locking = yes
-            }
+       filename = ${radacctdir}/detail-combined
+        permissions = 0600
+        dir_permissions = 0755
+        locking = yes
+    }
 
 INSTALLATION
 ------------
@@ -1565,27 +1565,27 @@ edit radiusd.conf::
             }
             # regular detail files
             detail detail1 {
-                    detailfile = ${radacctdir}/%{Client-IP-Address}/detail-%Y%m%d
-                    detailperm = 0600
-                    dirperm = 0755
+                    filename = ${radacctdir}/%{Client-IP-Address}/detail-%Y%m%d
+                    permissions = 0600
+                    dir_permissions = 0755
             }
             # temp detail file to replicate to accountrad
             detail detail2 {
-                    detailfile= ${radacctdir}/detail-combined
-                    detailperm = 0600
-                    dirperm = 0755
+                    filename = ${radacctdir}/detail-combined
+                    permissions = 0600
+                    dir_permissions = 0755
                     locking = yes
             }
 
             #radutmp {
             #  filename = ${logdir}/radutmp
-            #  perm = 0600
+            #  permissions =  0600
             #  callerid = "yes"
             #}
 
             #radutmp sradutmp {
             #  filename = ${logdir}/sradutmp
-            #  perm = 0644
+            #  permissions =  0644
             #  callerid = "no"
             #}
 

diff --git a/man/man5/radiusd.conf.5 b/man/man5/radiusd.conf.5
index 01282f0..3f7caa6 100644 (file)
--- a/man/man5/radiusd.conf.5
+++ b/man/man5/radiusd.conf.5
@@ -152,10 +152,10 @@ Will set variable \fBblogs\fP to the value of variable \fBfoo\fP, from the
 section which contains the current section.
 
 .DS
-       blogs = ${modules.detail.detailfile}
+       blogs = ${modules.detail.filename}
 
 .DE
-Will set variable \fBblogs\fP to the value of variable \fBdetailfile\fP,
+Will set variable \fBblogs\fP to the value of variable \fBfilename\fP,
 of the \fBdetail\fP module, which is in the \fBmodules\fP section of
 the configuration file.
 

diff --git a/man/man5/radrelay.conf.5 b/man/man5/radrelay.conf.5
index c8f0889..3b3acaf 100644 (file)
--- a/man/man5/radrelay.conf.5
+++ b/man/man5/radrelay.conf.5
@@ -65,11 +65,11 @@ For example:
 .DS
        detail radrelay-detail {
 .br
-               detailfile = ${radacctdir}/radrelay/detail
+               filename = ${radacctdir}/radrelay/detail
 .br
-               detailperm = 0600
+               permissions = 0600
 .br
-               dirperm = 0755
+               dir_permissions = 0755
 .br
                locking = yes
 .br
@@ -105,7 +105,7 @@ file, configure \fBradrelay.conf\fP with the following section:
 .br
                type = detail
 .br
-               detail = ${radacctdir}/radrelay/detail
+               filename = ${radacctdir}/radrelay/detail
 .br
                max_outstanding = 100
 .br

diff --git a/man/man5/rlm_detail.5 b/man/man5/rlm_detail.5
index 1fe2738..e89bc9e 100644 (file)
--- a/man/man5/rlm_detail.5
+++ b/man/man5/rlm_detail.5
@@ -51,11 +51,11 @@ modules {
 .br
   detail {
 .br
-    file = %A/%{Client-IP-Address}/detail-%Y%m
+    filename = %A/%{Client-IP-Address}/detail-%Y%m
 .br
-    perm = 0600
+    permissions = 0600
 .br
-    dirperm = 0755
+    dir_permissions = 0755
 .br
     locking = no
 .br

diff --git a/raddb/experimental.conf b/raddb/experimental.conf
index dcca32f..a20b931 100644 (file)
--- a/raddb/experimental.conf
+++ b/raddb/experimental.conf
@@ -103,17 +103,6 @@
                usersfile = ${confdir}/users_db
        }
 
-       # See doc/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)
-               hash_reload = 600
-       }
-
        # Instantiate a couple instances of the idn module
        idn {
        }

diff --git a/raddb/mods-available/attr_filter b/raddb/mods-available/attr_filter
index 991c656..d23423c 100644 (file)
--- a/raddb/mods-available/attr_filter
+++ b/raddb/mods-available/attr_filter
@@ -10,13 +10,13 @@
 # proxied servers, to make sure we send back to our RADIUS client
 # only allowed attributes.
 attr_filter attr_filter.post-proxy {
-       file = ${modconfdir}/${.:name}/post-proxy
+       filename = ${modconfdir}/${.:name}/post-proxy
 }
 
 # attr_filter - filters the attributes in the packets we send to
 # the RADIUS home servers.
 attr_filter attr_filter.pre-proxy {
-       file = ${modconfdir}/${.:name}/pre-proxy
+       filename = ${modconfdir}/${.:name}/pre-proxy
 }
 
 # Enforce RFC requirements on the contents of Access-Reject
@@ -25,7 +25,7 @@ attr_filter attr_filter.pre-proxy {
 #
 attr_filter attr_filter.access_reject {
        key = %{User-Name}
-       file = ${modconfdir}/${.:name}/access_reject
+       filename = ${modconfdir}/${.:name}/access_reject
 }
 
 # Enforce RFC requirements on the contents of Access-Challenge
@@ -34,7 +34,7 @@ attr_filter attr_filter.access_reject {
 #
 attr_filter attr_filter.access_challenge {
        key = %{User-Name}
-       file = ${modconfdir}/${.:name}/access_challenge
+       filename = ${modconfdir}/${.:name}/access_challenge
 }
 
 
@@ -44,5 +44,5 @@ attr_filter attr_filter.access_challenge {
 #
 attr_filter attr_filter.accounting_response {
        key = %{User-Name}
-       file = ${modconfdir}/${.:name}/accounting_response
+       filename = ${modconfdir}/${.:name}/accounting_response
 }

diff --git a/raddb/mods-available/detail b/raddb/mods-available/detail
index 91abdfc..8cc3000 100644 (file)
--- a/raddb/mods-available/detail
+++ b/raddb/mods-available/detail
@@ -31,13 +31,13 @@ detail {
        #  be ONE "listen" section reading detail files from a
        #  particular directory.
        #
-       file = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/detail-%Y%m%d
+       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/detail-%Y%m%d
 
        #
        #  If you are using radrelay, delete the above line for "file",
        #  and use this one instead:
        #
-#      file = ${radacctdir}/detail
+#      filename = ${radacctdir}/detail
 
        #
        #  The Unix-style permissions on the 'detail' file.
@@ -46,7 +46,7 @@ detail {
        #  information about users.  So by keeping the file
        #  permissions restrictive, we can prevent unwanted
        #  people from seeing that information.
-       perm = 0600
+       permissions = 0600
 
        # The Unix group of the log file.
        #

diff --git a/raddb/mods-available/detail.example.com b/raddb/mods-available/detail.example.com
index 9b589fa..827cdf5 100644 (file)
--- a/raddb/mods-available/detail.example.com
+++ b/raddb/mods-available/detail.example.com
@@ -23,5 +23,5 @@
 #  $Id$
 #
 detail detail.example.com {
-       file = ${radacctdir}/detail.example.com/detail-%Y%m%d:%H:%G
+       filename = ${radacctdir}/detail.example.com/detail-%Y%m%d:%H:%G
 }

diff --git a/raddb/mods-available/detail.log b/raddb/mods-available/detail.log
index b07ba49..b91cf7c 100644 (file)
--- a/raddb/mods-available/detail.log
+++ b/raddb/mods-available/detail.log
@@ -15,12 +15,12 @@
 #  in the 'authorize' section, below.
 #
 detail auth_log {
-       file = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/auth-detail-%Y%m%d
+       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/auth-detail-%Y%m%d
 
        #
        #  This MUST be 0600, otherwise anyone can read
        #  the users passwords!
-       perm = 0600
+       permissions = 0600
 
        # You may also strip out passwords completely
        suppress {
@@ -37,9 +37,9 @@ detail auth_log {
 #  in the 'post-auth' section, below.
 #
 detail reply_log {
-       file = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/reply-detail-%Y%m%d
+       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/reply-detail-%Y%m%d
 
-       perm = 0600
+       permissions = 0600
 }
 
 #
@@ -49,12 +49,12 @@ detail reply_log {
 #  in the 'pre-proxy' section, below.
 #
 detail pre_proxy_log {
-       file = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/pre-proxy-detail-%Y%m%d
+       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/pre-proxy-detail-%Y%m%d
 
        #
        #  This MUST be 0600, otherwise anyone can read
        #  the users passwords!
-       perm = 0600
+       permissions = 0600
 
        # You may also strip out passwords completely
        #suppress {
@@ -69,7 +69,7 @@ detail pre_proxy_log {
 #  in the 'post-proxy' section, below.
 #
 detail post_proxy_log {
-       file = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/post-proxy-detail-%Y%m%d
+       filename = ${radacctdir}/%{%{Packet-Src-IP-Address}:-%{Packet-Src-IPv6-Address}}/post-proxy-detail-%Y%m%d
 
-       perm = 0600
+       permissions = 0600
 }

diff --git a/raddb/mods-available/files b/raddb/mods-available/files
index 0b9e13f..fa5c4ae 100644 (file)
--- a/raddb/mods-available/files
+++ b/raddb/mods-available/files
@@ -18,7 +18,7 @@ files {
        # specific files configured. It's recommended that 
        # per section instances of 'files' are used, as per section
        # files will be deprecated in a future release.
-       file = ${moddir}/authorize
+       filename = ${moddir}/authorize
 
        usersfile = ${moddir}/authorize
        acctusersfile = ${moddir}/accounting

diff --git a/raddb/mods-available/passwd b/raddb/mods-available/passwd
index 92496bf..b7d01af 100644 (file)
--- a/raddb/mods-available/passwd
+++ b/raddb/mods-available/passwd
@@ -8,7 +8,7 @@
 #  See the "smbpasswd" and "etc_group" files for more examples.
 #
 # parameters are:
-#   filename - path to filename
+#   filename - path to file
 #
 #   format - format for filename record. This parameters
 #            correlates record in the passwd file and RADIUS

diff --git a/raddb/mods-available/perl b/raddb/mods-available/perl
index 4f2f150..bf4369d 100644 (file)
--- a/raddb/mods-available/perl
+++ b/raddb/mods-available/perl
@@ -11,7 +11,7 @@ perl {
        #  'rlm_exec' module, but it is persistent, and therefore
        #  faster.
        #
-       module = ${modconfdir}/${.:instance}/example.pl
+       filename = ${modconfdir}/${.:instance}/example.pl
 
        #
        #  The following hashes are given to the module and

diff --git a/raddb/mods-available/radutmp b/raddb/mods-available/radutmp
index 3ad88cd..9eff9f9 100644 (file)
--- a/raddb/mods-available/radutmp
+++ b/raddb/mods-available/radutmp
@@ -47,7 +47,7 @@ radutmp {
 
        # Set the file permissions, as the contents of this file
        # are usually private.
-       perm = 0600
+       permissions = 0600
 
        callerid = "yes"
 }

diff --git a/raddb/mods-available/redis b/raddb/mods-available/redis
index 600aaa2..5cc78f5 100644 (file)
--- a/raddb/mods-available/redis
+++ b/raddb/mods-available/redis
@@ -10,7 +10,7 @@
 redis {
        #  Host where the redis server is located.
        #  We recommend using ONLY 127.0.0.1 !
-       hostname = 127.0.0.1
+       server = 127.0.0.1
 
        #  The default port.
        port = 6379

diff --git a/raddb/mods-available/sradutmp b/raddb/mods-available/sradutmp
index a7700ba..723377d 100644 (file)
--- a/raddb/mods-available/sradutmp
+++ b/raddb/mods-available/sradutmp
@@ -11,6 +11,6 @@
 # section.
 radutmp sradutmp {
        filename = ${logdir}/sradutmp
-       perm = 0644
+       permissions = 0644
        callerid = "no"
 }

diff --git a/src/main/detail.c b/src/main/detail.c
index cb326c4..a0341f4 100644 (file)
--- a/src/main/detail.c
+++ b/src/main/detail.c
@@ -829,7 +829,9 @@ int detail_decode(rad_listen_t *this, UNUSED REQUEST *request)
 
 
 static const CONF_PARSER detail_config[] = {
-       { "filename",   PW_TYPE_STRING_PTR,
+       { "detail",   PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
+         offsetof(listen_detail_t, filename), NULL,  NULL },
+       { "filename",   PW_TYPE_STRING_PTR | PW_TYPE_REQUIRED,
          offsetof(listen_detail_t, filename), NULL,  NULL },
        { "load_factor",   PW_TYPE_INTEGER,
          offsetof(listen_detail_t, load_factor), NULL, Stringify(10)},

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index 11d7d4e..ee81bcb 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -39,7 +39,7 @@ RCSID("$Id$")
  *     be used as the instance handle.
  */
 typedef struct rlm_attr_filter {
-       char            *file;
+       char            *filename;
        char            *key;
        int             relaxed;
        PAIR_LIST       *attrs;
@@ -47,9 +47,11 @@ typedef struct rlm_attr_filter {
 
 static const CONF_PARSER module_config[] = {
        { "attrsfile",     PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
-         offsetof(rlm_attr_filter_t, file), NULL, NULL},
-       { "file",     PW_TYPE_FILENAME | PW_TYPE_REQUIRED,
-         offsetof(rlm_attr_filter_t, file), NULL, NULL},
+         offsetof(rlm_attr_filter_t, filename), NULL, NULL},
+       { "file",     PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
+         offsetof(rlm_attr_filter_t, filename), NULL, NULL},
+       { "filename",     PW_TYPE_FILENAME | PW_TYPE_REQUIRED,
+         offsetof(rlm_attr_filter_t, filename), NULL, NULL},
        { "key",     PW_TYPE_STRING_PTR,
          offsetof(rlm_attr_filter_t, key), NULL, "%{Realm}" },
        { "relaxed",    PW_TYPE_BOOLEAN,
@@ -130,9 +132,9 @@ static int mod_instantiate(UNUSED CONF_SECTION *conf, void *instance)
        rlm_attr_filter_t *inst = instance;
        int rcode;
 
-       rcode = attr_filter_getfile(inst, inst->file, &inst->attrs);
+       rcode = attr_filter_getfile(inst, inst->filename, &inst->attrs);
        if (rcode != 0) {
-               ERROR("Errors reading %s", inst->file);
+               ERROR("Errors reading %s", inst->filename);
 
                return -1;
        }

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 93da4f5..c01d7f8 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -50,7 +50,7 @@ RCSID("$Id$")
  * Holds the configuration and preparsed data for a instance of rlm_detail.
  */
 typedef struct detail_instance {
-       char    *file;          //!< File/path to write to.
+       char    *filename;      //!< File/path to write to.
        int     perm;           //!< Permissions to use for new files.
        char    *group;         //!< Group to use for new files.
        
@@ -66,18 +66,20 @@ typedef struct detail_instance {
 
 static const CONF_PARSER module_config[] = {
        { "detailfile",    PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
-         offsetof(struct detail_instance,file), NULL, NULL },
-       { "file",    PW_TYPE_STRING_PTR | PW_TYPE_REQUIRED,
-         offsetof(struct detail_instance,file), NULL, "%A/%{Client-IP-Address}/detail" },
+         offsetof(struct detail_instance,filename), NULL, NULL },
+       { "file",    PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
+         offsetof(struct detail_instance,filename), NULL, NULL },
+       { "filename",    PW_TYPE_STRING_PTR | PW_TYPE_REQUIRED,
+         offsetof(struct detail_instance,filename), NULL, "%A/%{Client-IP-Address}/detail" },
        { "header",    PW_TYPE_STRING_PTR,
          offsetof(struct detail_instance,header), NULL, "%t" },
        { "detailperm",    PW_TYPE_INTEGER | PW_TYPE_DEPRECATED,
          offsetof(struct detail_instance,perm), NULL, NULL },
-       { "perm",    PW_TYPE_INTEGER,
+       { "permissions",    PW_TYPE_INTEGER,
          offsetof(struct detail_instance,perm), NULL, "0600" },
        { "group",       PW_TYPE_STRING_PTR,
          offsetof(struct detail_instance,group), NULL,  NULL},
-       { "dirperm",       PW_TYPE_INTEGER,
+       { "dir_permissions", PW_TYPE_INTEGER,
          offsetof(struct detail_instance,dirperm),    NULL, "0755" },
        { "locking",       PW_TYPE_BOOLEAN,
          offsetof(struct detail_instance,locking),    NULL, "no" },
@@ -160,8 +162,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 /*
  *     Do detail, compatible with old accounting
  */
-static rlm_rcode_t do_detail(void *instance, REQUEST *request, RADIUS_PACKET *packet,
-                            int compat)
+static rlm_rcode_t do_detail(void *instance, REQUEST *request, RADIUS_PACKET *packet, int compat)
 {
        int             outfd;
        char            timestamp[256];
@@ -200,10 +201,10 @@ static rlm_rcode_t do_detail(void *instance, REQUEST *request, RADIUS_PACKET *pa
         *      feed it through radius_xlat() to expand the
         *      variables.
         */
-       if (radius_xlat(buffer, sizeof(buffer), request, inst->file, NULL, NULL) < 0) {
+       if (radius_xlat(buffer, sizeof(buffer), request, inst->filename, NULL, NULL) < 0) {
            return RLM_MODULE_FAIL;
        }
-       RDEBUG2("%s expands to %s", inst->file, buffer);
+       RDEBUG2("%s expands to %s", inst->filename, buffer);
 
 #ifdef HAVE_FNMATCH_H
 #ifdef FNM_FILE_NAME
@@ -488,7 +489,7 @@ static rlm_rcode_t mod_accounting(void *instance, REQUEST *request)
 {
 #ifdef WITH_DETAIL
        if (request->listener->type == RAD_LISTEN_DETAIL &&
-           strcmp(((struct detail_instance *)instance)->file,
+           strcmp(((struct detail_instance *)instance)->filename,
                   ((listen_detail_t *)request->listener->data)->filename) == 0) {
                RDEBUG("Suppressing writes to detail file as the request was just read from a detail file.");
                return RLM_MODULE_NOOP;

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index 1541855..32f808e 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -35,7 +35,7 @@ typedef struct rlm_files_t {
 
        char *key;
 
-       char *file;
+       char *filename;
        fr_hash_table_t *common;
 
        /* autz */
@@ -79,8 +79,8 @@ static int fallthrough(VALUE_PAIR *vp)
 }
 
 static const CONF_PARSER module_config[] = {
-       { "file",          PW_TYPE_FILENAME,
-         offsetof(rlm_files_t,file), NULL, NULL },
+       { "filename",      PW_TYPE_FILENAME,
+         offsetof(rlm_files_t,filename), NULL, NULL },
        { "usersfile",     PW_TYPE_FILENAME,
          offsetof(rlm_files_t,usersfile), NULL, NULL },
        { "acctusersfile", PW_TYPE_FILENAME,
@@ -326,6 +326,7 @@ static int getusersfile(TALLOC_CTX *ctx, char const *filename, fr_hash_table_t *
 static int mod_detach(void *instance)
 {
        rlm_files_t *inst = instance;
+       fr_hash_table_free(inst->common);
        fr_hash_table_free(inst->users);
        fr_hash_table_free(inst->acctusers);
 #ifdef WITH_PROXY
@@ -349,7 +350,7 @@ static int mod_instantiate(UNUSED CONF_SECTION *conf, void *instance)
 #undef READFILE
 #define READFILE(_x, _y) do { if (getusersfile(inst, inst->_x, &inst->_y, inst->compat_mode) != 0) { ERROR("Failed reading %s", inst->_x); mod_detach(inst);return -1;} } while (0)
 
-       READFILE(file, common);
+       READFILE(filename, common);
        READFILE(usersfile, users);
        READFILE(acctusersfile, acctusers);
 

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 85a84cb..2fcd60c 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -84,7 +84,9 @@ typedef struct rlm_perl_t {
                        offsetof(rlm_perl_t,func_##_x), NULL, Stringify(_x)}
 
 static const CONF_PARSER module_config[] = {
-       { "module",  PW_TYPE_FILENAME | PW_TYPE_REQUIRED,
+       { "module",  PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
+         offsetof(rlm_perl_t,module), NULL,  NULL},
+       { "filename",  PW_TYPE_FILENAME | PW_TYPE_REQUIRED,
          offsetof(rlm_perl_t,module), NULL,  NULL},
 
        RLM_PERL_CONF(authorize),

diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index 3c614e4..3c46f03 100644 (file)
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -66,7 +66,9 @@ static const CONF_PARSER module_config[] = {
          offsetof(rlm_radutmp_t,case_sensitive), NULL,  "yes"},
        { "check_with_nas", PW_TYPE_BOOLEAN,
          offsetof(rlm_radutmp_t,check_nas), NULL,  "yes"},
-       { "perm",     PW_TYPE_INTEGER,
+       { "perm",     PW_TYPE_INTEGER | PW_TYPE_DEPRECATED,
+         offsetof(rlm_radutmp_t,permission), NULL,  NULL },
+       { "permissions",     PW_TYPE_INTEGER,
          offsetof(rlm_radutmp_t,permission), NULL,  "0644" },
        { "callerid", PW_TYPE_BOOLEAN,
          offsetof(rlm_radutmp_t,callerid_ok), NULL, "no" },

diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index d3769cd..bef4980 100644 (file)
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -30,8 +30,10 @@ RCSID("$Id$")
 #include "rlm_redis.h"
 
 static const CONF_PARSER module_config[] = {
-       { "hostname", PW_TYPE_STRING_PTR,
-         offsetof(REDIS_INST, hostname), NULL, "127.0.0.1"},
+       { "hostname", PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
+         offsetof(REDIS_INST, hostname), NULL, NULL},
+       { "server", PW_TYPE_STRING_PTR | PW_TYPE_REQUIRED,
+         offsetof(REDIS_INST, hostname), NULL, NULL},
        { "port", PW_TYPE_INTEGER,
          offsetof(REDIS_INST, port), NULL, "6379"},
        { "database", PW_TYPE_INTEGER,

diff --git a/src/modules/rlm_ruby/rlm_ruby.c b/src/modules/rlm_ruby/rlm_ruby.c
index baae8fd..da919ec 100644 (file)
--- a/src/modules/rlm_ruby/rlm_ruby.c
+++ b/src/modules/rlm_ruby/rlm_ruby.c
@@ -61,7 +61,7 @@ typedef struct rlm_ruby_t {
 #endif
        RLM_RUBY_STRUCT(detach);
 
-       char *script_file;
+       char *filename;
        char *module_name;
        VALUE module;
 
@@ -77,9 +77,9 @@ typedef struct rlm_ruby_t {
  *     buffer over-flows.
  */
 static const CONF_PARSER module_config[] = {
-       { "script_file", PW_TYPE_FILENAME | PW_TYPE_REQUIRED,
-         offsetof(struct rlm_ruby_t, script_file), NULL, NULL},
-       { "module_name", PW_TYPE_STRING_PTR,
+       { "filename", PW_TYPE_FILENAME | PW_TYPE_REQUIRED,
+         offsetof(struct rlm_ruby_t, filename), NULL, NULL},
+       { "module", PW_TYPE_STRING_PTR,
          offsetof(struct rlm_ruby_t, module_name), NULL, "Radiusd"},
        { NULL, -1, 0, NULL, NULL} /* end of module_config */
 };
@@ -376,14 +376,14 @@ static int mod_instantiate(UNUSED CONF_SECTION *conf, void *instance)
         */
        rb_define_module_function(module, "radlog", radlog_rb, 2);
 
-       DEBUG("Loading file %s...", inst->script_file);
-       rb_load_protect(rb_str_new2(inst->script_file), 0, &status);
+       DEBUG("Loading file %s...", inst->filename);
+       rb_load_protect(rb_str_new2(inst->filename), 0, &status);
        if (status) {
-               EDEBUG("Error loading file %s status: %d", inst->script_file, status);
+               EDEBUG("Error loading file %s status: %d", inst->filename, status);
                
                return -1;
        }
-       DEBUG("Loaded file %s", inst->script_file);
+       DEBUG("Loaded file %s", inst->filename);
 
        /*
         *      Import user modules.